Merge from trunk

1 files changed, 413 insertions, 7 deletions

diff --git a/lisp/ChangeLog.trunk b/lisp/ChangeLog.trunk
index e4d402afa76..d087982edee 100644
--- a/lisp/ChangeLog.trunk
+++ b/lisp/ChangeLog.trunk
@@ -1,3 +1,410 @@
+2011-03-21  Glenn Morris  <rgm@gnu.org>
+
+        * eshell/esh-opt.el (eshell-eval-using-options, eshell-process-args):
+        Doc fixes.
+
+2011-03-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-theme.el: Add missing provide statement.
+        (customize-create-theme): Extract theme value correctly.
+        (custom-theme-visit-theme): Autoload.
+        (customize-create-theme): Prompt before inserting default faces.
+
+2011-03-20  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc-menu.el (calc-units-menu): Add entries for logarithmic
+        units and musical notes.
+
+2011-03-20  Leo  <sdl.web@gmail.com>
+
+        * ido.el (ido-read-internal): Use completing-read-default.
+        (ido-completing-read): Fix compatibility with completing-read.
+
+2011-03-20  Christian Ohler  <ohler@gnu.org>
+
+        * emacs-lisp/ert.el (ert-run-tests-batch): Remove unused variable.
+        (ert-delete-all-tests): Use `called-interactively-p' rather than
+        `interactive-p'.
+        (ert--make-xrefs-region): Respect END.
+
+2011-03-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * dired-aux.el (dired-create-directory): Signal an error if the
+        directory already exists (Bug#8246).
+
+        * facemenu.el (list-colors-display): Call list-faces-display
+        inside with-help-window.
+        (list-colors-print): Use display property to align the final
+        column, instead of checking window-width.
+
+2011-03-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * emerge.el (emerge-metachars): Separate value for ms-dos and
+        windows-nt systems.
+        (emerge-protect-metachars): Quote correctly for ms-dos and
+        windows-nt systems.
+
+2011-03-19  Ralph Schleicher  <rs@ralph-schleicher.de>
+
+        * info.el (info-initialize): Replace all uses of `:' with
+        path-separator for compatibility with non-Unix systems.
+        Cache quoting of path-separator.  (Bug#8258)
+
+2011-03-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * avoid.el (mouse-avoidance-mode, mouse-avoidance-nudge-dist)
+        (mouse-avoidance-threshold, mouse-avoidance-banish-destination)
+        (mouse-avoidance-mode): Fix typos in docstrings.
+
+2011-03-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (package-subdirectory-regexp): Move from package.el.
+        Omit \\` and \\', and let callers add them.
+
+        * emacs-lisp/package.el (package-strip-version)
+        (package-load-all-descriptors): Add \\` and \\' to
+        package-subdirectory-regexp before using it.
+        (package-untar-buffer): New arg DIR; ensure that file untars only
+        into this expected directory.  Remove superfluous delete-region.
+        (package-unpack): Caller changed.
+        (package-tar-file-info): Use package-subdirectory-regexp.
+
+2011-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/diff-mode.el (diff-mode-map): Shadow problematic bindings from
+        diff-mode-shared-map (bug#8284).
+        (diff-mode-shared-map): Re-introduce some bindings that were problematic.
+
+2011-03-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * calendar/time-date.el (format-seconds): Use assoc instead of
+        assoc-string, since assoc-string doesn't exist in XEmacs.
+
+2011-03-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * custom.el (custom-known-themes): Reflow docstring.
+        (custom-theme-load-path): Fix typo in docstring.
+        (load-theme): Fix typo in error message.
+        (custom-available-themes, custom-variable-theme-value):
+        Use `let', not `let*'.
+
+2011-03-17  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/README: Mention inclusion of musical notes.
+
+        * calc/calc-units.el (calc-lu-quant): Rename from
+        `calc-logunits-quantity'.
+        (calcFunc-lupquant): Rename from `calcFunc-powerquant'.
+        (calcFunc-lufquant): Rename from `calcFunc-fieldquant'.
+        (calc-db): Rename from `calc-dblevel'.
+        (calcFunc-dbpower): Rename from `calcFunc-dbpowerlevel'.
+        (calcFunc-dbfield): Rename from `calcFunc-dbfieldlevel'.
+        (calc-np): Rename from `calc-nplevel'.
+        (calcFunc-nppower): Rename from `calcFunc-nppowerlevel'.
+        (calcFunc-npfield): Rename from `calcFunc-npfieldlevel'.
+        (calc-lu-plus): Rename from `calc-logunits-add'.
+        (calcFunc-lupadd): Rename from `calcFunc-lupoweradd'.
+        (calcFunc-lufadd): Rename from `calcFunc-lufieldadd'.
+        (calc-lu-minus): Rename from `calc-logunits-sub'.
+        (calcFunc-lupsub): Rename from `calcFunc-lupowersub'.
+        (calcFunc-lufsub): Rename from `calcFunc-lufieldsub'.
+        (calc-lu-times): Rename from `calc-logunits-mul'.
+        (calcFunc-lupmul): Rename from `calcFunc-lupowermul'.
+        (calcFunc-lufmul): Rename from `calcFunc-lufieldmul'.
+        (calc-lu-divide): Rename from `calc-logunits-div'.
+        (calcFunc-lupdiv): Rename from `calcFunc-lupowerdiv'.
+        (calcFunc-lufdiv): Rename from `calcFunc-lufielddiv'.
+
+        * calc/calc-ext.el (calc-init-extensions): Update the names of the
+        functions being autoloaded.
+
+        * calc/calc.el (calc-lu-power-reference): Rename from
+        `calc-logunits-power-reference'.
+        (calc-lu-field-reference): Rename from
+        `calc-logunits-field-reference'.
+
+        * calc/calc-help (calc-l-prefix-help): Mention musical note functions.
+
+2011-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-all-sorted-completions):
+        Use :completion-cycle-penalty text property if present.
+
+2011-03-16  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-yank-processing): Adjust for new rebulleting
+        regime so bullet being yanked is used without prompting the user
+        for a choice.
+
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * startup.el (command-line): Warn the user that _emacs is deprecated.
+
+2011-03-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/delphi.el (delphi-search-path, delphi-indent-level)
+        (delphi-verbose, delphi-comment-face, delphi-string-face)
+        (delphi-keyword-face, delphi-ignore-changes, delphi-indent-line)
+        (delphi-mode-abbrev-table, delphi-debug-buffer, delphi-tab)
+        (delphi-find-unit, delphi-find-current-xdef, delphi-fill-comment)
+        (delphi-new-comment-line, delphi-font-lock-defaults)
+        (delphi-debug-mode-map, delphi-mode-syntax-table, delphi-mode):
+        Fix typos in docstrings.
+
+2011-03-15  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-make-topic-prefix, allout-rebullet-heading):
+        Invert the roles of character and string values for INSTEAD, so a
+        string is used for the more common case of a defaulting prompt.
+
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/ruby-mode.el (ruby-backward-sexp):
+        * progmodes/ebrowse.el (ebrowse-draw-file-member-info):
+        * play/gamegrid.el (gamegrid-make-face):
+        * play/bubbles.el (bubbles--grid-width, bubbles--grid-height)
+        (bubbles--colors, bubbles--shift-mode, bubbles--initialize-images):
+        * notifications.el (notifications-notify):
+        * net/xesam.el (xesam-search-engines):
+        * net/quickurl.el (quickurl-list-insert):
+        * vc/vc-hg.el (vc-hg-dir-printer): Fix use of case.
+
+2011-03-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (command-line): Update package subdirectory regexp.
+
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * allout.el (allout-abbreviate-flattened-numbering)
+        (allout-mode-deactivate-hook): Fix up obsolescence "date".
+
+        * subr.el (read-char-choice): Only show the cursor after the prompt,
+        not after the answer.
+
+2011-03-15  Kevin Ryde  <user42@zip.com.au>
+
+        * help-fns.el (variable-at-point): Skip leading quotes, if any
+        (bug#8253).
+
+2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-save-excursion): Change the
+        warning message.
+
+2011-03-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * shell.el (shell): When called interactively, offer to change the
+        shell file name on remote hosts.
+
+2011-03-13  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * net/ldap.el (ldap-search-internal): Add `auth-source-search'
+        integration for LDAP parameters.  The host, base, user or binddn,
+        and secret tokens can be specified in a netrc file, for instance.
+        This is optional because an `auth-source' parameter must be
+        specified in the search attributes.
+
+2011-03-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * help.el (describe-mode): Link to the mode's definition (bug#8185).
+
+2011-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * ebuff-menu.el (electric-buffer-menu-mode-map): Move initialization
+        into declaration.  Remove redundant and harmful binding.
+
+2011-03-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * files.el (file-ownership-preserved-p): Pass `integer' as an
+        explicit 2nd argument to `file-attributes'.  If the file's owner
+        is the Administrators group on Windows, and the current user is
+        Administrator, consider that a match.
+
+        * server.el (server-ensure-safe-dir): Consider server directory
+        safe on MS-Windows if its owner is the Administrators group while
+        the current Emacs user is Administrator.  Use `=' to compare
+        numerical UIDs, since they could be integers or floats.
+
+2011-03-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * vc/vc-bzr.el (vc-bzr-state): Handle bzr 2.3.0 (follow-up to bug#8170).
+
+2011-03-12  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.2.1.
+
+        * net/tramp-sh.el (tramp-methods): Exchange "%k" marker with options.
+
+        * net/trampver.el: Update release number.
+
+2011-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/compile.el (compilation--previous-directory): Fix up
+        various nil/dead-marker mismatches (bug#8014).
+        (compilation-directory-properties, compilation-error-properties):
+        Don't call it at a position past the one we're about to change.
+
+        * emacs-lisp/bytecomp.el (byte-compile-make-obsolete-variable):
+        Disable obsolescence warnings in the file that declares it.
+
+2011-03-11  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout-widgets.el (allout-widgets-tally): Initialize
+        allout-widgets-tally as a hash table rather than nil to prevent
+        mode-line redisplay warnings.
+        Also, clarify the module description and fix a comment typo.
+
+2011-03-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * help-fns.el (describe-variable): Don't complete keywords.
+        Suggested by Teodor Zlatanov <tzz@lifelogs.com>.
+
+2011-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (package-version-join): Impose a standard
+        string representation for pre/alpha/beta version lists.
+        (package-unpack-single): Standardize the directory name by passing
+        it through package-version-join.
+        (package-strip-rcs-id): Accept any version string that does not
+        signal an error in version-to-list.
+
+2011-03-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        * simple.el (delete-trailing-whitespace): Return nil for the
+        benefit of `write-file-functions'.
+
+2011-03-10  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc-hg.el (vc-hg-pull, vc-hg-merge-branch): Use vc-hg-program.
+
+        * vc/vc-git.el (vc-git-program): New option.
+        (vc-git-branches, vc-git-pull, vc-git-merge-branch, vc-git-command)
+        (vc-git--call): Use it.
+
+        * eshell/esh-util.el (eshell-condition-case): Doc fix.
+
+        * cus-edit.el (Custom-newline): If no button at point, look
+        for a subgroup button at start-of-line.  (Bug#2298)
+
+        * mail/rmail.el (rmail-msgend, rmail-msgbeg): Doc fixes.
+
+2011-03-10  Julien Danjou  <julien@danjou.info>
+
+        * avoid.el (mouse-avoidance-ignore-p): Do not move the cursor if
+        `cursor-type' is nil.
+
+2011-03-09  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc.el (calc-mode-map): Don't bind "C-_" to `calc-missing-key'.
+
+2011-03-09  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el Summary: Change so yank of distinctive-bullet items
+        preserves the existing header prefix, rebulleting it if necessary,
+        rather than replacing it.  This is necessary for proper operation
+        of cooperative addons like allout-widgets.
+        (allout-make-topic-prefix, allout-rebullet-heading): Change
+        SOLICIT arg to INSTEAD, and interpret additionally a string value
+        as alternate bullet to be used, instead of prompting the user for
+        a bullet character.
+
+2011-03-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Do
+        not use `tramp-file-name-port', because this returns also
+        `tramp-default-port'.
+
+2011-03-09  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+
+        * net/rcirc.el (rcirc-handler-001): Remove useless
+        with-rcirc-process-buffer.
+        (rcirc-check-auth-status): Swap arguments to string-match.
+
+2011-03-09  Glenn Morris  <rgm@gnu.org>
+
+        * shell.el (shell-mode):
+        Set comint-input-ring-size from HISTSIZE.  (Bug#7889)
+
+        * progmodes/gdb-mi.el (gdb): Improve 2010-12-08 change.
+        Check for GDBHISTFILE, HISTSIZE, etc.  (Bug#7889)
+
+2011-03-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (package-refresh-contents)
+        (package-menu-execute): Use condition-case-no-debug.
+
+2011-03-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * simple.el (shell-command-to-string): Use `process-file'.
+
+        * emacs-lisp/package.el (package-tar-file-info): Handle also
+        remote files.
+
+        * emacs-lisp/package-x.el (package-upload-buffer-internal): Use
+        `equal' for upload base check.
+
+2011-03-08  Arni Magnusson  <arnima@hafro.is>  (tiny change)
+
+        * textmodes/texinfo.el (texinfo-environments):
+        Add deftypecv, deftypeivar, deftypemethod, deftypeop, html.  (Bug#2783)
+
+2011-03-08  Glenn Morris  <rgm@gnu.org>
+
+        * cus-start.el (cursor-in-non-selected-windows):
+        Fix :set quoting oddness.  (Bug#8192)
+
+        * font-lock.el (lisp-font-lock-keywords-1): Don't highlight `)'
+        in some setf expressions.  (Bug#2159)
+
+2011-03-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * custom.el (custom-available-themes): Return themes in
+        alphabetical order.
+
+2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/cc-cmds.el (c-beginning-of-statement): Fix incorrect
+        application of patch from Alan Mackenzie (Bug#7595).
+
+2011-03-07  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+
+        * net/rcirc.el (rcirc-connect): Fix PASS bug.
+
+2011-03-07  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc.el (vc-next-action): Add missing space to y-or-n-p prompt.
+        Give an explicit error if failed to make writable.  (Bug#6146)
+
+2011-03-07  Ed Reingold  <reingold@emr.cs.iit.edu>
+
+        * calendar/cal-hebrew.el (diary-hebrew-yahrzeit):
+        Add optional `after-sunset' argument.  (Bug#8190)
+
+2011-03-07  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
+
+        * play/morse.el (nato-alphabet, nato-region, denato-region):
+        New variable and functions.  (Bug#2288)
+        (morse-region, unmorse-region): Barf if read-only.
+
+2011-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/gud.el (gdb-script-syntax-propertize-function):
+        Don't change the syntax of a \n that closes a comment (bug#8169).
+
+2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package-x.el (package-archive-upload-base): Make it a
+        defcustom.
+        (package--update-file): Doc fix.  Accept relative file names.
+        (package--archive-contents-from-file): Remove the argument, since
+        it's necessarily always "archive-contents".
+        (package-maint-add-news-item): Pass relative file name args to
+        package--update-file.
+        (package-upload-buffer-internal): Prompt for a destination if
+        package-archive-upload-base is invalid.  Create the directory if
+        it does not exist.
+        (package-upload-buffer, package-upload-file): Doc fix.
+
 2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
         * isearch.el (isearch-mode-map): Bind C-y to isearch-yank-kill,
@@ -11,8 +418,8 @@
 
 2011-03-06  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc/calc-ext.el (calc-init-extensions): Rename
-        calc-logunits-dblevel and calc-logunits-nplevel to calc-dblevel
+        * calc/calc-ext.el (calc-init-extensions):
+        Rename calc-logunits-dblevel and calc-logunits-nplevel to calc-dblevel
         and calc-nplevel, respectively.  Add keybindings for calc-spn,
         calc-midi and calc-freq.  Add autoloads for calcFunc-spn,
         calcFunc-midi, calcFunc-freq, calc-spn, calc-midi and calc-freq.
@@ -732,7 +1139,7 @@
 2011-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * lisp/allout-widgets.el (allout-widgets-icons-light-subdir)
-        (allout-widgets-icons-dark-subdir): Track relocations of icons
+        (allout-widgets-icons-dark-subdir): Track relocations of icons.
         * lisp/allout.el: Remove commentary about remove encryption
         passphrase mnemonic support and verification.
         (allout-encrypt-string): Recognize epg failure to decrypt gpg2
@@ -1109,10 +1516,9 @@
 
         (allout-auto-activation-helper, allout-setup): New autoloads
         implement new custom set procedure for allout-auto-activation.
-        Also, explicitly invoke
-        (allout-setup) after allout-auto-activation is custom-defined, to
-        effect the settings in emacs sessions besides the few where
-        allout-auto-activation customization is donea.
+        Also, explicitly invoke (allout-setup) after allout-auto-activation
+        is custom-defined, to affect the settings in emacs sessions besides
+        the few where allout-auto-activation customization is done.
         (allout-auto-activation): Use allout-auto-activation-helper to
         :set.  Revise the docstring.
         (allout-init): Reduce functionality to just customizing