Now on revision 108618.
------------------------------------------------------------
revno: 108618
committer: Juanma Barranquero <lekktu@gmail.com>
branch nick: trunk
timestamp: Fri 2012-06-15 23:47:39 +0200
message:
  lisp/makefile.w32-in (COMPILE_FIRST): Synch with changes in revno:88864.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2012-06-15 03:18:14 +0000
+++ lisp/ChangeLog	2012-06-15 21:47:39 +0000
@@ -1,3 +1,8 @@
+2012-06-15  Juanma Barranquero  <lekktu@gmail.com>
+
+	* makefile.w32-in (COMPILE_FIRST): Synch with makefile.in changes
+	in revno:88864.
+
 2012-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/cl-lib.el (cl--defsubst-expand): Autoload inliner

=== modified file 'lisp/makefile.w32-in'
--- lisp/makefile.w32-in	2012-06-14 23:53:41 +0000
+++ lisp/makefile.w32-in	2012-06-15 21:47:39 +0000
@@ -76,18 +76,14 @@
 BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS)
 
 # Files to compile before others during a bootstrap.  This is done to
-# speed up the bootstrap process.  The CC files are compiled first
-# because CC mode tweaks the compilation process, and requiring
-# cc-mode when it is not compiled doesn't work during the
-# bootstrapping.
+# speed up the bootstrap process.
 
 COMPILE_FIRST = \
+	$(lisp)/emacs-lisp/bytecomp.el \
 	$(lisp)/emacs-lisp/byte-opt.el \
-	$(lisp)/emacs-lisp/bytecomp.el \
 	$(lisp)/emacs-lisp/macroexp.el \
 	$(lisp)/emacs-lisp/cconv.el \
-	$(lisp)/progmodes/cc-mode.el \
-	$(lisp)/progmodes/cc-vars.el
+	$(lisp)/emacs-lisp/autoload.el
 
 # The actual Emacs command run in the targets below.
 # The quotes around $(EMACS) are here because the user could type
------------------------------------------------------------
revno: 108617
committer: Julien Danjou <julien@danjou.info>
branch nick: trunk
timestamp: Fri 2012-06-15 16:47:31 +0200
message:
  erc: use auth-source
  
  * erc.el (erc-open): Use `auth-source' for password retrieval when
    possible.
diff:
=== modified file 'lisp/erc/ChangeLog'
--- lisp/erc/ChangeLog	2012-06-12 05:47:14 +0000
+++ lisp/erc/ChangeLog	2012-06-15 14:47:31 +0000
@@ -1,3 +1,8 @@
+2012-06-15  Julien Danjou  <julien@danjou.info>
+
+	* erc.el (erc-open): Use `auth-source' for password retrieval when
+	possible.
+
 2012-06-12  Chong Yidong  <cyd@gnu.org>
 
 	* erc-dcc.el (erc-dcc-chat-filter-functions): Rename from

=== modified file 'lisp/erc/erc.el'
--- lisp/erc/erc.el	2012-06-08 16:39:49 +0000
+++ lisp/erc/erc.el	2012-06-15 14:47:31 +0000
@@ -71,6 +71,7 @@
 (require 'font-lock)
 (require 'pp)
 (require 'thingatpt)
+(require 'auth-source)
 (require 'erc-compat)
 
 (defvar erc-official-location
@@ -2006,7 +2007,19 @@
     ;; The local copy of `erc-nick' - the list of nicks to choose
     (setq erc-default-nicks (if (consp erc-nick) erc-nick (list erc-nick)))
     ;; password stuff
-    (setq erc-session-password passwd)
+    (setq erc-session-password (or passwd
+				   (let ((secret
+					  (plist-get
+					   (nth 0
+						(auth-source-search :host server
+								    :max 1
+								    :user nick
+								    :port port
+								    :require '(:secret)))
+					   :secret)))
+				     (if (functionp secret)
+					 (funcall secret)
+				       secret))))
     ;; debug output buffer
     (setq erc-dbuf
 	  (when erc-log-p
------------------------------------------------------------
revno: 108616
committer: Stefan Monnier <monnier@iro.umontreal.ca>
branch nick: trunk
timestamp: Thu 2012-06-14 23:20:42 -0400
message:
  * macroexp.el (macroexp--compiler-macro): Fix paren typo.
diff:
=== modified file 'lisp/emacs-lisp/macroexp.el'
--- lisp/emacs-lisp/macroexp.el	2012-06-15 03:18:14 +0000
+++ lisp/emacs-lisp/macroexp.el	2012-06-15 03:20:42 +0000
@@ -98,7 +98,7 @@
   (condition-case err
       (apply handler form (cdr form))
     (error (message "Compiler-macro error for %S: %S" (car form) err)
-           form))))
+           form)))
 
 (defun macroexp--expand-all (form)
   "Expand all macros in FORM.