[Emacs-diffs] /srv/bzr/emacs/trunk r101376: Merge changes from emacs-23 branch.

[Chong Yidong]

------------------------------------------------------------
revno: 101376 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-06 12:40:56 -0400
message:
  Merge changes from emacs-23 branch.
modified:
  doc/emacs/ChangeLog
  doc/emacs/dired.texi
  doc/emacs/misc.texi
  doc/lispref/ChangeLog
  doc/lispref/files.texi
  lisp/ChangeLog
  lisp/desktop.el
  lisp/emacs-lisp/rx.el
  lisp/files.el
  lisp/proced.el
  lisp/textmodes/bibtex.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-09-02 10:20:20 +0000
+++ b/doc/emacs/ChangeLog       2010-09-06 16:38:03 +0000
@@ -1,3 +1,11 @@
+2010-09-06  Chong Yidong  <address@hidden>
+
+       * dired.texi (Dired Enter): Minor doc fix (Bug#6982).
+
+2010-09-06  Glenn Morris  <address@hidden>
+
+       * misc.texi (Saving Emacs Sessions): Mention desktop-path.  (Bug#6948)
+
 2010-09-02  Jan Djärv  <address@hidden>
 
        * frames.texi (Cut/Paste Other App): Remove vut-buffer text.

=== modified file 'doc/emacs/dired.texi'
--- a/doc/emacs/dired.texi      2010-07-10 18:52:53 +0000
+++ b/doc/emacs/dired.texi      2010-09-06 16:38:03 +0000
@@ -75,13 +75,12 @@
 
   The variable @code{dired-listing-switches} specifies the options to
 give to @code{ls} for listing the directory; this string @emph{must}
-contain @samp{-l}.  If you use a numeric prefix argument with the
address@hidden command, you can specify the @code{ls} switches with the
-minibuffer before you enter the directory specification.  No matter
-how they are specified, the @code{ls} switches can include short
-options (that is, single characters) requiring no arguments, and long
-options (starting with @samp{--}) whose arguments are specified with
address@hidden
+contain @samp{-l}.  If you use a prefix argument with the @code{dired}
+command, you can specify the @code{ls} switches with the minibuffer
+before you enter the directory specification.  No matter how they are
+specified, the @code{ls} switches can include short options (that is,
+single characters) requiring no arguments, and long options (starting
+with @samp{--}) whose arguments are specified with @samp{=}.
 
   On MS-Windows and MS-DOS systems, Emacs @emph{emulates} @code{ls};
 see @ref{ls in Lisp}, for options and peculiarities of that emulation.

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2010-08-21 02:14:07 +0000
+++ b/doc/emacs/misc.texi       2010-09-02 05:41:23 +0000
@@ -2349,8 +2349,11 @@
 
 @findex desktop-change-dir
 @findex desktop-revert
address@hidden desktop-path
   If you turn on @code{desktop-save-mode} in your init file, then when
 Emacs starts, it looks for a saved desktop in the current directory.
+(More precisely, it looks in the directories specified by
address@hidden, and uses the first desktop it finds.)
 Thus, you can have separate saved desktops in different directories,
 and the starting directory determines which one Emacs reloads.  You
 can save the current desktop and reload one saved in another directory

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-09-02 10:17:02 +0000
+++ b/doc/lispref/ChangeLog     2010-09-06 16:38:03 +0000
@@ -1,3 +1,7 @@
+2010-09-06  Alexander Klimov  <address@hidden>  (tiny change)
+
+       * files.texi (Directory Names): Use \` rather than ^.
+
 2010-09-02  Jan Djärv  <address@hidden>
 
        * text.texi (Low-Level Kill Ring):

=== modified file 'doc/lispref/files.texi'
--- a/doc/lispref/files.texi    2010-06-23 03:36:56 +0000
+++ b/doc/lispref/files.texi    2010-09-05 22:03:56 +0000
@@ -1933,7 +1933,7 @@
 abbreviations to use for file directories.  Each element has the form
 @code{(@var{from} . @var{to})}, and says to replace @var{from} with
 @var{to} when it appears in a directory name.  The @var{from} string is
-actually a regular expression; it should always start with @samp{^}.
+actually a regular expression; it should always start with @samp{\`}.
 The @var{to} string should be an ordinary absolute directory name.  Do
 not use @samp{~} to stand for a home directory in that string.  The
 function @code{abbreviate-file-name} performs these substitutions.
@@ -1946,9 +1946,9 @@
 and so on.
 
 @example
-(("^/home/fsf" . "/fsf")
- ("^/home/gp" . "/gp")
- ("^/home/gd" . "/gd"))
+(("\\`/home/fsf" . "/fsf")
+ ("\\`/home/gp" . "/gp")
+ ("\\`/home/gd" . "/gd"))
 @end example
 @end defopt
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-06 00:10:55 +0000
+++ b/lisp/ChangeLog    2010-09-06 16:38:03 +0000
@@ -1,3 +1,20 @@
+2010-09-06  Alexander Klimov  <address@hidden>  (tiny change)
+
+       * files.el (directory-abbrev-alist): Use \` as default regexp.
+
+       * emacs-lisp/rx.el (rx-any): Don't explode ranges that end in special
+       chars like - or ] (bug#6984).
+       (rx-any-condense-range): Explode 2-char ranges.
+
+2010-09-06  Glenn Morris  <address@hidden>
+
+       * desktop.el (desktop-path): Bump :version after 2009-09-15 change.
+
+2010-09-06  Stefan Monnier  <address@hidden>
+
+       * textmodes/bibtex.el:
+       * proced.el: Update to new email for Roland Winkler <address@hidden>.
+
 2010-09-05  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/imap.el (imap-message-map): Removed optional buffer parameter,

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2010-06-09 22:08:50 +0000
+++ b/lisp/desktop.el   2010-09-06 16:38:03 +0000
@@ -226,7 +226,7 @@
 The base name of the file is specified in `desktop-base-file-name'."
   :type '(repeat directory)
   :group 'desktop
-  :version "22.1")
+  :version "23.2")                      ; user-emacs-directory added
 
 (defcustom desktop-missing-file-warning nil
   "If non-nil, offer to recreate the buffer of a deleted file.

=== modified file 'lisp/emacs-lisp/rx.el'
--- a/lisp/emacs-lisp/rx.el     2010-06-29 12:09:07 +0000
+++ b/lisp/emacs-lisp/rx.el     2010-09-05 09:44:55 +0000
@@ -427,7 +427,7 @@
            (mapcar (lambda (e)
                      (cond
                       ((= (car e) (cdr e)) (list (car e)))
-                      ;; ((= (1+ (car e)) (cdr e)) (list (car e) (cdr e)))
+                      ((= (1+ (car e)) (cdr e)) (list (car e) (cdr e)))
                       ((list e))))
                    l))
      (delete-dups str))))
@@ -545,7 +545,10 @@
                            ((numberp e) (string e))
                            ((consp e)
                             (if (and (= (1+ (car e)) (cdr e))
-                                     (null (memq (car e) '(?\] ?-))))
+                                      ;; rx-any-condense-range should
+                                      ;; prevent this case from happening.
+                                     (null (memq (car e) '(?\] ?-)))
+                                      (null (memq (cdr e) '(?\] ?-))))
                                 (string (car e) (cdr e))
                               (string (car e) ?- (cdr e))))
                            (e)))

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-09-05 19:03:20 +0000
+++ b/lisp/files.el     2010-09-06 16:38:03 +0000
@@ -67,9 +67,9 @@
 via absolute symbolic links.  Make TO the name of the link, and FROM
 the name it is linked to."
   :type '(repeat (cons :format "%v"
-                      :value ("" . "")
+                      :value ("\\`" . "")
                       (regexp :tag "From")
-                      (regexp :tag "To")))
+                      (string :tag "To")))
   :group 'abbrev
   :group 'find-file)
 

=== modified file 'lisp/proced.el'
--- a/lisp/proced.el    2010-01-13 08:35:10 +0000
+++ b/lisp/proced.el    2010-09-02 11:47:15 +0000
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
-;; Author: Roland Winkler <address@hidden>
+;; Author: Roland Winkler <address@hidden>
 ;; Keywords: Processes, Unix
 
 ;; This file is part of GNU Emacs.

=== modified file 'lisp/textmodes/bibtex.el'
--- a/lisp/textmodes/bibtex.el  2010-05-25 02:11:08 +0000
+++ b/lisp/textmodes/bibtex.el  2010-09-06 16:38:03 +0000
@@ -9,7 +9,7 @@
 ;;      Mike Newton <address@hidden>
 ;;      Aaron Larson <address@hidden>
 ;;      Dirk Herrmann <address@hidden>
-;; Maintainer: Roland Winkler <address@hidden>
+;; Maintainer: Roland Winkler <address@hidden>
 ;; Keywords: BibTeX, LaTeX, TeX
 
 ;; This file is part of GNU Emacs.