# HG changeset patch # User Katsumi Yamaoka # Date 1283812949 0 # Node ID c3d46c9f8007dba80040c94791e8d134529b9fdc # Parent 51163d71c385ec9e818957b8cf773e7c6729c96e# Parent b02c6c7716e47c6e9375db99477e6e80d58232c9 Merge from mainline. diff -r 51163d71c385 -r c3d46c9f8007 doc/emacs/ChangeLog --- a/doc/emacs/ChangeLog Mon Sep 06 06:05:40 2010 +0000 +++ b/doc/emacs/ChangeLog Mon Sep 06 22:42:29 2010 +0000 @@ -1,3 +1,11 @@ +2010-09-06 Chong Yidong + + * dired.texi (Dired Enter): Minor doc fix (Bug#6982). + +2010-09-06 Glenn Morris + + * misc.texi (Saving Emacs Sessions): Mention desktop-path. (Bug#6948) + 2010-09-02 Jan Djärv * frames.texi (Cut/Paste Other App): Remove vut-buffer text. diff -r 51163d71c385 -r c3d46c9f8007 doc/emacs/dired.texi --- a/doc/emacs/dired.texi Mon Sep 06 06:05:40 2010 +0000 +++ b/doc/emacs/dired.texi Mon Sep 06 22:42:29 2010 +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 -@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{=}. +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. diff -r 51163d71c385 -r c3d46c9f8007 doc/emacs/misc.texi --- a/doc/emacs/misc.texi Mon Sep 06 06:05:40 2010 +0000 +++ b/doc/emacs/misc.texi Mon Sep 06 22:42:29 2010 +0000 @@ -2349,8 +2349,11 @@ @findex desktop-change-dir @findex desktop-revert +@vindex 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 +@var{desktop-path}, 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 diff -r 51163d71c385 -r c3d46c9f8007 doc/lispref/ChangeLog --- a/doc/lispref/ChangeLog Mon Sep 06 06:05:40 2010 +0000 +++ b/doc/lispref/ChangeLog Mon Sep 06 22:42:29 2010 +0000 @@ -1,3 +1,7 @@ +2010-09-06 Alexander Klimov (tiny change) + + * files.texi (Directory Names): Use \` rather than ^. + 2010-09-02 Jan Djärv * text.texi (Low-Level Kill Ring): diff -r 51163d71c385 -r c3d46c9f8007 doc/lispref/files.texi --- a/doc/lispref/files.texi Mon Sep 06 06:05:40 2010 +0000 +++ b/doc/lispref/files.texi Mon Sep 06 22:42:29 2010 +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 diff -r 51163d71c385 -r c3d46c9f8007 lisp/ChangeLog --- a/lisp/ChangeLog Mon Sep 06 06:05:40 2010 +0000 +++ b/lisp/ChangeLog Mon Sep 06 22:42:29 2010 +0000 @@ -1,3 +1,20 @@ +2010-09-06 Alexander Klimov (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 + + * desktop.el (desktop-path): Bump :version after 2009-09-15 change. + +2010-09-06 Stefan Monnier + + * textmodes/bibtex.el: + * proced.el: Update to new email for Roland Winkler . + 2010-09-05 Lars Magne Ingebrigtsen * net/imap.el (imap-message-map): Removed optional buffer parameter, diff -r 51163d71c385 -r c3d46c9f8007 lisp/desktop.el --- a/lisp/desktop.el Mon Sep 06 06:05:40 2010 +0000 +++ b/lisp/desktop.el Mon Sep 06 22:42:29 2010 +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. diff -r 51163d71c385 -r c3d46c9f8007 lisp/emacs-lisp/rx.el --- a/lisp/emacs-lisp/rx.el Mon Sep 06 06:05:40 2010 +0000 +++ b/lisp/emacs-lisp/rx.el Mon Sep 06 22:42:29 2010 +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))) diff -r 51163d71c385 -r c3d46c9f8007 lisp/files.el --- a/lisp/files.el Mon Sep 06 06:05:40 2010 +0000 +++ b/lisp/files.el Mon Sep 06 22:42:29 2010 +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) diff -r 51163d71c385 -r c3d46c9f8007 lisp/proced.el --- a/lisp/proced.el Mon Sep 06 06:05:40 2010 +0000 +++ b/lisp/proced.el Mon Sep 06 22:42:29 2010 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. -;; Author: Roland Winkler +;; Author: Roland Winkler ;; Keywords: Processes, Unix ;; This file is part of GNU Emacs. diff -r 51163d71c385 -r c3d46c9f8007 lisp/textmodes/bibtex.el --- a/lisp/textmodes/bibtex.el Mon Sep 06 06:05:40 2010 +0000 +++ b/lisp/textmodes/bibtex.el Mon Sep 06 22:42:29 2010 +0000 @@ -9,7 +9,7 @@ ;; Mike Newton ;; Aaron Larson ;; Dirk Herrmann -;; Maintainer: Roland Winkler +;; Maintainer: Roland Winkler ;; Keywords: BibTeX, LaTeX, TeX ;; This file is part of GNU Emacs.