merge trunk

6 files changed, 28 insertions, 15 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5b90c2a1f9f..d4f9ab747ed 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+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):
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 86ecfd122ef..b6d0b5c7ed2 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1115,16 +1115,11 @@ 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
 @end group
@@ -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
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index dcf816e7fd3..3b0e5251d5e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,10 @@
+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.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 8ed57699df5..86aaadf8ae8 100644
--- a/doc/misc/gnus.texi
+++ b/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
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5b3c92f8c2..78cc1862c2f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 128ff4bb143..1c38c59bba6 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/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)