Commit 10999305 authored by Chong Yidong's avatar Chong Yidong
Browse files

Merge changes from emacs-23 branch.

parents ed96ace9 9c405a86
2010-09-06 Chong Yidong <cyd@stupidchicken.com>
* dired.texi (Dired Enter): Minor doc fix (Bug#6982).
2010-09-06 Glenn Morris <rgm@gnu.org>
* misc.texi (Saving Emacs Sessions): Mention desktop-path. (Bug#6948)
2010-09-02 Jan Djärv <jan.h.d@swipnet.se> 2010-09-02 Jan Djärv <jan.h.d@swipnet.se>
* frames.texi (Cut/Paste Other App): Remove vut-buffer text. * frames.texi (Cut/Paste Other App): Remove vut-buffer text.
......
...@@ -75,13 +75,12 @@ a directory name. ...@@ -75,13 +75,12 @@ a directory name.
The variable @code{dired-listing-switches} specifies the options to The variable @code{dired-listing-switches} specifies the options to
give to @code{ls} for listing the directory; this string @emph{must} give to @code{ls} for listing the directory; this string @emph{must}
contain @samp{-l}. If you use a numeric prefix argument with the contain @samp{-l}. If you use a prefix argument with the @code{dired}
@code{dired} command, you can specify the @code{ls} switches with the command, you can specify the @code{ls} switches with the minibuffer
minibuffer before you enter the directory specification. No matter before you enter the directory specification. No matter how they are
how they are specified, the @code{ls} switches can include short specified, the @code{ls} switches can include short options (that is,
options (that is, single characters) requiring no arguments, and long single characters) requiring no arguments, and long options (starting
options (starting with @samp{--}) whose arguments are specified with with @samp{--}) whose arguments are specified with @samp{=}.
@samp{=}.
On MS-Windows and MS-DOS systems, Emacs @emph{emulates} @code{ls}; On MS-Windows and MS-DOS systems, Emacs @emph{emulates} @code{ls};
see @ref{ls in Lisp}, for options and peculiarities of that emulation. see @ref{ls in Lisp}, for options and peculiarities of that emulation.
......
...@@ -2349,8 +2349,11 @@ sessions, or add this line in your init file (@pxref{Init File}): ...@@ -2349,8 +2349,11 @@ sessions, or add this line in your init file (@pxref{Init File}):
@findex desktop-change-dir @findex desktop-change-dir
@findex desktop-revert @findex desktop-revert
@vindex desktop-path
If you turn on @code{desktop-save-mode} in your init file, then when 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. Emacs starts, it looks for a saved desktop in the current directory.
(More precisely, it looks in the directories specified by
@var{desktop-path}, and uses the first desktop it finds.)
Thus, you can have separate saved desktops in different directories, Thus, you can have separate saved desktops in different directories,
and the starting directory determines which one Emacs reloads. You and the starting directory determines which one Emacs reloads. You
can save the current desktop and reload one saved in another directory can save the current desktop and reload one saved in another directory
......
2010-09-06 Alexander Klimov <alserkli@inbox.ru> (tiny change)
* files.texi (Directory Names): Use \` rather than ^.
2010-09-02 Jan Djärv <jan.h.d@swipnet.se> 2010-09-02 Jan Djärv <jan.h.d@swipnet.se>
* text.texi (Low-Level Kill Ring): * text.texi (Low-Level Kill Ring):
......
...@@ -1933,7 +1933,7 @@ The variable @code{directory-abbrev-alist} contains an alist of ...@@ -1933,7 +1933,7 @@ The variable @code{directory-abbrev-alist} contains an alist of
abbreviations to use for file directories. Each element has the form abbreviations to use for file directories. Each element has the form
@code{(@var{from} . @var{to})}, and says to replace @var{from} with @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 @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 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 not use @samp{~} to stand for a home directory in that string. The
function @code{abbreviate-file-name} performs these substitutions. function @code{abbreviate-file-name} performs these substitutions.
...@@ -1946,9 +1946,9 @@ and so on are normally accessed through symbolic links named @file{/fsf} ...@@ -1946,9 +1946,9 @@ and so on are normally accessed through symbolic links named @file{/fsf}
and so on. and so on.
@example @example
(("^/home/fsf" . "/fsf") (("\\`/home/fsf" . "/fsf")
("^/home/gp" . "/gp") ("\\`/home/gp" . "/gp")
("^/home/gd" . "/gd")) ("\\`/home/gd" . "/gd"))
@end example @end example
@end defopt @end defopt
......
2010-09-06 Alexander Klimov <alserkli@inbox.ru> (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 <rgm@gnu.org>
* desktop.el (desktop-path): Bump :version after 2009-09-15 change.
2010-09-06 Stefan Monnier <monnier@iro.umontreal.ca>
* textmodes/bibtex.el:
* proced.el: Update to new email for Roland Winkler <winkler@gnu.org>.
2010-09-05 Lars Magne Ingebrigtsen <larsi@gnus.org> 2010-09-05 Lars Magne Ingebrigtsen <larsi@gnus.org>
   
* net/imap.el (imap-message-map): Removed optional buffer parameter, * net/imap.el (imap-message-map): Removed optional buffer parameter,
......
...@@ -226,7 +226,7 @@ the normal hook `desktop-not-loaded-hook' is run." ...@@ -226,7 +226,7 @@ the normal hook `desktop-not-loaded-hook' is run."
The base name of the file is specified in `desktop-base-file-name'." The base name of the file is specified in `desktop-base-file-name'."
:type '(repeat directory) :type '(repeat directory)
:group 'desktop :group 'desktop
:version "22.1") :version "23.2") ; user-emacs-directory added
(defcustom desktop-missing-file-warning nil (defcustom desktop-missing-file-warning nil
"If non-nil, offer to recreate the buffer of a deleted file. "If non-nil, offer to recreate the buffer of a deleted file.
......
...@@ -427,7 +427,7 @@ Only both edges of each range is checked." ...@@ -427,7 +427,7 @@ Only both edges of each range is checked."
(mapcar (lambda (e) (mapcar (lambda (e)
(cond (cond
((= (car e) (cdr e)) (list (car e))) ((= (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)))) ((list e))))
l)) l))
(delete-dups str)))) (delete-dups str))))
...@@ -545,7 +545,10 @@ ARG is optional." ...@@ -545,7 +545,10 @@ ARG is optional."
((numberp e) (string e)) ((numberp e) (string e))
((consp e) ((consp e)
(if (and (= (1+ (car e)) (cdr 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))
(string (car e) ?- (cdr e)))) (string (car e) ?- (cdr e))))
(e))) (e)))
......
...@@ -67,9 +67,9 @@ Use this feature when you have directories which you normally refer to ...@@ -67,9 +67,9 @@ Use this feature when you have directories which you normally refer to
via absolute symbolic links. Make TO the name of the link, and FROM via absolute symbolic links. Make TO the name of the link, and FROM
the name it is linked to." the name it is linked to."
:type '(repeat (cons :format "%v" :type '(repeat (cons :format "%v"
:value ("" . "") :value ("\\`" . "")
(regexp :tag "From") (regexp :tag "From")
(regexp :tag "To"))) (string :tag "To")))
:group 'abbrev :group 'abbrev
:group 'find-file) :group 'find-file)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> ;; Author: Roland Winkler <winkler@gnu.org>
;; Keywords: Processes, Unix ;; Keywords: Processes, Unix
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
;; Mike Newton <newton@gumby.cs.caltech.edu> ;; Mike Newton <newton@gumby.cs.caltech.edu>
;; Aaron Larson <alarson@src.honeywell.com> ;; Aaron Larson <alarson@src.honeywell.com>
;; Dirk Herrmann <D.Herrmann@tu-bs.de> ;; Dirk Herrmann <D.Herrmann@tu-bs.de>
;; Maintainer: Roland Winkler <roland.winkler@physik.uni-erlangen.de> ;; Maintainer: Roland Winkler <winkler@gnu.org>
;; Keywords: BibTeX, LaTeX, TeX ;; Keywords: BibTeX, LaTeX, TeX
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment