merge trunk

doc/lispref/ChangeLog

+2011-12-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* files.texi (File Attributes, Changing Files):
+	Use a more-natural notation for octal numbers.
+
 2011-12-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* variables.texi (Variables with Restricted Values):

doc/lispref/files.texi

@@ -1115,15 +1115,10 @@ This function recursively follows symbolic links at all levels.
 @end group
 
 @group
-(set-file-modes "~/junk/diffs" 438)
+(set-file-modes "~/junk/diffs" #o666)
      @result{} nil
 @end group
 
-@group
-(format "%o" 438)
-     @result{} "666"             ; @r{Convert to octal.}
-@end group
-
 @group
 % ls -l diffs
   -rw-rw-rw-  1 lewis 0 3063 Oct 30 16:00 diffs
@@ -1570,10 +1565,10 @@ the bitwise complement of the ``umask'' value.
 
 The argument @var{mode} must be an integer.  On most systems, only the
 low 9 bits of @var{mode} are meaningful.  You can use the Lisp construct
-for octal character codes to enter @var{mode}; for example,
+for octal numbers to enter @var{mode}; for example,
 
 @example
-(set-default-file-modes ?\644)
+(set-default-file-modes #o644)
 @end example
 
 Saving a modified version of an existing file does not count as creating

doc/misc/ChangeLog

+2011-12-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* gnus.texi (Mail Source Customization, Mail Back End Variables):
+	Use octal notation for file permissions, which are normally
+	thought of in octal.
+	(Mail Back End Variables): Use more-plausible modes in example.
+
 2011-12-20  Alan Mackenzie  <acm@muc.de>
 
 	* cc-mode.texi: Update version string 5.31 -> 5.32.

doc/misc/gnus.texi

@@ -15033,7 +15033,7 @@ number.
 
 @item mail-source-default-file-modes
 @vindex mail-source-default-file-modes
-All new mail files will get this file mode.  The default is 384.
+All new mail files will get this file mode.  The default is @code{#o600}.
 
 @item mail-source-movemail-program
 @vindex mail-source-movemail-program
@@ -15123,10 +15123,10 @@ default file modes the new mail files get:
 
 @lisp
 (add-hook 'nnmail-pre-get-new-mail-hook
-          (lambda () (set-default-file-modes 511)))
+          (lambda () (set-default-file-modes #o700)))
 
 (add-hook 'nnmail-post-get-new-mail-hook
-          (lambda () (set-default-file-modes 551)))
+          (lambda () (set-default-file-modes #o775)))
 @end lisp
 
 @item nnmail-use-long-file-names

lisp/ChangeLog

+2011-12-28  Chong Yidong  <cyd@gnu.org>
+
+	* progmodes/gdb-mi.el (gdb-get-source-file-list)
+	(gdb-get-source-file): Move mode line update to
+	gdb-get-source-file (Bug#10087).
+
 2011-12-25  Chong Yidong  <cyd@gnu.org>
 
 	* progmodes/gud.el (gud-gdb-fetch-lines-filter): Just use

lisp/progmodes/gdb-mi.el

@@ -3787,9 +3787,7 @@ is set in them."
   (dolist (buffer (buffer-list))
     (with-current-buffer buffer
       (when (member buffer-file-name gdb-source-file-list)
-	(gdb-init-buffer))))
-  (gdb-force-mode-line-update
-   (propertize "ready" 'face font-lock-variable-name-face)))
+	(gdb-init-buffer)))))
 
 (defun gdb-get-main-selected-frame ()
   "Trigger for `gdb-frame-handler' which uses main current
@@ -4128,7 +4126,9 @@ buffers, if required."
     (gdb-get-buffer-create 'gdb-breakpoints-buffer)
     (if (and gdb-show-main gdb-main-file)
         (let ((pop-up-windows t))
-          (display-buffer (gud-find-file gdb-main-file))))))
+          (display-buffer (gud-find-file gdb-main-file)))))
+  (gdb-force-mode-line-update
+   (propertize "ready" 'face font-lock-variable-name-face)))
 
 ;;from put-image
 (defun gdb-put-string (putstring pos &optional dprop &rest sprops)