[Emacs-diffs] /srv/bzr/emacs/trunk r111561: Merge from emacs-24; up to r111189

[Glenn Morris]

------------------------------------------------------------
revno: 111561 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-01-19 12:38:13 -0800
message:
  Merge from emacs-24; up to r111189
modified:
  ChangeLog
  Makefile.in
  doc/emacs/ChangeLog
  doc/emacs/custom.texi
  doc/emacs/trouble.texi
  doc/lispref/ChangeLog
  doc/lispref/macros.texi
  etc/NEWS
  lisp/ChangeLog
  lisp/dired.el
  lisp/emacs-lisp/lisp-mode.el
  lisp/progmodes/etags.el
  src/ChangeLog
  src/fns.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-01-16 17:45:39 +0000
+++ b/ChangeLog 2013-01-19 20:38:13 +0000
@@ -1,3 +1,8 @@
+2013-01-19  Glenn Morris  <address@hidden>
+
+       * Makefile.in (install-arch-indep): Put back a chmod that was
+       removed 2012-05-19.  (Bug#13430)
+
 2013-01-16  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'Makefile.in'
--- a/Makefile.in       2013-01-02 16:13:04 +0000
+++ b/Makefile.in       2013-01-19 20:38:13 +0000
@@ -534,6 +534,7 @@
               tar -xvf - && cat > /dev/null) || exit 1; \
          [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
          for subdir in `find $${dest} -type d -print` ; do \
+           chmod a+rx $${subdir} ; \
            rm -f $${subdir}/.gitignore ; \
            rm -f $${subdir}/.arch-inventory ; \
            rm -f $${subdir}/.DS_Store ; \
@@ -568,7 +569,9 @@
            done )
        -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
 
-# The last chmod isn't needed at present.
+## The above chmods are needed because "umask 022; tar ..." is not
+## guaranteed to do the right thing; eg if we are root and tar is
+## preserving source permissions.
 
 ## We install only the relevant DOC file if possible
 ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-01-07 22:00:55 +0000
+++ b/doc/emacs/ChangeLog       2013-01-19 20:38:13 +0000
@@ -1,3 +1,11 @@
+2013-01-19  Glenn Morris  <address@hidden>
+
+       * custom.texi (Directory Variables): Fix paren typo.
+
+       * trouble.texi (Crashing): Not all addr2line have -p.  (Bug#13445)
+
+       * custom.texi (Custom Themes): Fix typo.
+
 2013-01-07  Bastien Guerry  <address@hidden>
 
        * help.texi (Apropos): Document `apropos-user-option' and update

=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi     2013-01-01 09:11:05 +0000
+++ b/doc/emacs/custom.texi     2013-01-18 01:53:34 +0000
@@ -555,7 +555,7 @@
 between various collections of settings, and to transfer such
 collections from one computer to another.
 
-  A Custom theme is stored an Emacs Lisp source file.  If the name of
+  A Custom theme is stored as an Emacs Lisp source file.  If the name of
 the Custom theme is @var{name}, the theme file is named
 @address@hidden  @xref{Creating Custom Themes}, for the
 format of a theme file and how to make one.
@@ -1305,7 +1305,7 @@
 @example
 ((nil . ((indent-tabs-mode . t)
          (fill-column . 80)))
- (c-mode . ((c-file-style . "BSD")))
+ (c-mode . ((c-file-style . "BSD")
             (subdirs . nil)))
  ("src/imported"
   . ((nil . ((change-log-default-name

=== modified file 'doc/emacs/trouble.texi'
--- a/doc/emacs/trouble.texi    2013-01-02 16:13:04 +0000
+++ b/doc/emacs/trouble.texi    2013-01-19 20:38:13 +0000
@@ -325,7 +325,7 @@
 
 @example
 sed -n 's/.*\[\(.*\)]$/\1/p' @var{backtrace} |
-  addr2line -Cfip -e @var{bindir}/@var{emacs-binary}
+  addr2line -C -f -i -e @var{bindir}/@var{emacs-binary}
 @end example
 
 @noindent
@@ -333,7 +333,9 @@
 the backtrace, @var{bindir} is the name of the directory that
 contains the Emacs executable, and @var{emacs-binary} is the name of
 the Emacs executable file, normally @file{emacs} on GNU and Unix
-systems and @file{emacs.exe} on MS-Windows and MS-DOS.
+systems and @file{emacs.exe} on MS-Windows and address@hidden
+may wish to add the @option{-p} option, if your version of
address@hidden supports it.}
 
 @cindex core dump
   Optionally, Emacs can generate a @dfn{core dump} when it crashes, on

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-01-19 09:59:51 +0000
+++ b/doc/lispref/ChangeLog     2013-01-19 20:38:13 +0000
@@ -1,3 +1,8 @@
+2013-01-19  Glenn Morris  <address@hidden>
+
+       * macros.texi (Indenting Macros): Fix order of an indent
+       symbol's arguments.  (Bug#13450)
+
 2013-01-19  Paul Eggert  <address@hidden>
 
        Allow floating-point file offsets.

=== modified file 'doc/lispref/macros.texi'
--- a/doc/lispref/macros.texi   2013-01-01 09:11:05 +0000
+++ b/doc/lispref/macros.texi   2013-01-16 02:03:06 +0000
@@ -606,12 +606,12 @@
 function receives two arguments:
 
 @table @asis
address@hidden @var{pos}
+The position at which the line being indented begins.
 @item @var{state}
 The value returned by @code{parse-partial-sexp} (a Lisp primitive for
 indentation and nesting computation) when it parses up to the
 beginning of this line.
address@hidden @var{pos}
-The position at which the line being indented begins.
 @end table
 
 @noindent

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-01-19 15:22:38 +0000
+++ b/etc/NEWS  2013-01-19 20:38:13 +0000
@@ -275,9 +275,9 @@
 
 ** New configure option `--enable-gcc-warnings' (for developing/debugging
 Emacs).  If building with GCC, this enables compile-time checks that
-warn about possibly-questionable C code.  On a recent GNU system there
-should be no warnings; on older and on non-GNU systems the generated
-warnings may be useful.
+warn/give errors about possibly-questionable C code.  On a recent GNU
+system there should be no warnings; on older and on non-GNU systems
+the results may be useful to developers.
 
 ** The configure option `--enable-use-lisp-union-type' has been
 renamed to `--enable-check-lisp-object-type', as the resulting

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-19 15:22:38 +0000
+++ b/lisp/ChangeLog    2013-01-19 20:38:13 +0000
@@ -1,3 +1,15 @@
+2013-01-19  Leo Liu  <address@hidden>
+
+       * dired.el (dired-get-marked-files): Prune erroneous values due to
+       last change.  (Bug#13152)
+
+2013-01-19  Glenn Morris  <address@hidden>
+
+       * progmodes/etags.el (tags-table-check-computed-list):
+       Preserve point in tags buffer.  (Bug#13412)
+
+       * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.
+
 2013-01-19  Christian Wittern  <address@hidden>  (tiny change)
            Chong Yidong  <address@hidden>
 

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2013-01-02 16:13:04 +0000
+++ b/lisp/dired.el     2013-01-19 20:38:13 +0000
@@ -620,12 +620,14 @@
 If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file,
 return (t FILENAME) instead of (FILENAME).
 Don't use that together with FILTER."
-  (let* ((all-of-them
-         (save-excursion
-           (dired-map-over-marks
-            (dired-get-filename localp 'no-error-if-not-filep)
-            arg nil distinguish-one-marked)))
-        result)
+  (let ((all-of-them
+        (save-excursion
+          (delq nil (dired-map-over-marks
+                     (dired-get-filename localp 'no-error-if-not-filep)
+                     arg nil distinguish-one-marked))))
+       result)
+    (when (equal all-of-them '(t))
+      (setq all-of-them nil))
     (if (not filter)
        (if (and distinguish-one-marked (eq (car all-of-them) t))
            all-of-them

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2013-01-02 16:13:04 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2013-01-19 20:38:13 +0000
@@ -1156,7 +1156,7 @@
 The function `calculate-lisp-indent' calls this to determine
 if the arguments of a Lisp function call should be indented specially.
 
-INDENT-POINT is the position where the user typed TAB, or equivalent.
+INDENT-POINT is the position at which the line being indented begins.
 Point is located at the point to indent under (for default indentation);
 STATE is the `parse-partial-sexp' state for that position.
 

=== modified file 'lisp/progmodes/etags.el'
--- a/lisp/progmodes/etags.el   2013-01-11 23:08:55 +0000
+++ b/lisp/progmodes/etags.el   2013-01-19 20:38:13 +0000
@@ -336,12 +336,15 @@
                     (save-excursion
                       (tags-verify-table (buffer-file-name table-buffer))))
                (with-current-buffer table-buffer
-                 (if (tags-included-tables)
-                     ;; Insert the included tables into the list we
-                     ;; are processing.
-                     (setcdr tables (nconc (mapcar 'tags-expand-table-name
-                                                   (tags-included-tables))
-                                           (cdr tables)))))
+                  ;; Needed so long as etags-tags-included-tables
+                  ;; does not save-excursion.
+                  (save-excursion
+                    (if (tags-included-tables)
+                        ;; Insert the included tables into the list we
+                        ;; are processing.
+                        (setcdr tables (nconc (mapcar 'tags-expand-table-name
+                                                      (tags-included-tables))
+                                              (cdr tables))))))
              ;; This table is not in core yet.  Insert a placeholder
              ;; saying we must read it into core to check for included
              ;; tables before searching the next table in the list.
@@ -1550,6 +1553,7 @@
                 files)))
     (nreverse files)))
 
+;; FIXME?  Should this save-excursion?
 (defun etags-tags-included-tables () ; Doc string?
   (let ((files nil)
        beg)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-01-19 20:04:33 +0000
+++ b/src/ChangeLog     2013-01-19 20:38:13 +0000
@@ -1,3 +1,7 @@
+2013-01-19  Glenn Morris  <address@hidden>
+
+       * fns.c (Frandom): Doc fix.
+
 2013-01-19  Eli Zaretskii  <address@hidden>
 
        * editfns.c (get_pos_property): Use SAFE_ALLOCA_LISP, to avoid

=== modified file 'src/fns.c'
--- a/src/fns.c 2013-01-04 02:53:48 +0000
+++ b/src/fns.c 2013-01-19 20:38:13 +0000
@@ -66,7 +66,10 @@
 
 With positive integer LIMIT, return random number in interval [0,LIMIT).
 With argument t, set the random number seed from the current time and pid.
-Other values of LIMIT are ignored.  */)
+With a string argument, set the seed based on the string's contents.
+Other values of LIMIT are ignored.
+
+See Info node `(elisp)Random Numbers' for more details.  */)
   (Lisp_Object limit)
 {
   EMACS_INT val;