Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu
[bpt/emacs.git] / lisp / ChangeLog
index 468e83f..e4df943 100644 (file)
@@ -1,3 +1,325 @@
+2014-04-07  João Távora  <joaotavora@gmail.com>
+
+       * elec-pair.el:
+       (electric-pair--syntax-ppss): When inside comments parse from
+       comment beginning.
+       (electric-pair--balance-info): Fix typo in comment.
+       (electric-pair--in-unterminated-string-p): Delete.
+       (electric-pair--unbalanced-strings-p): New function.
+       (electric-pair-string-bound-function): New var.
+       (electric-pair-inhibit-if-helps-balance): Decide quote pairing
+       according to `electric-pair--in-unterminated-string-p'
+
+2014-04-07  João Távora  <joaotavora@gmail.com>
+
+       * elec-pair.el (electric-pair-inhibit-if-helps-balance): Inhibit
+       quote pairing if point-max is inside an unterminated string.
+       (electric-pair--looking-at-unterminated-string-p):
+       Delete.
+       (electric-pair--in-unterminated-string-p): New function.
+
+2014-04-07  Glenn Morris  <rgm@gnu.org>
+
+       * shell.el (shell-directory-tracker):
+       Go back to just ignoring failures.  (Bug#17159)
+
+2014-04-06  João Távora  <joaotavora@gmail.com>
+
+       Fix `electric-pair-delete-adjacent-pairs' in modes binding
+       backspace. (bug#16981)
+       * elec-pair.el (electric-pair-backward-delete-char): Delete.
+       (electric-pair-backward-delete-char-untabify): Delete.
+       (electric-pair-mode-map): Bind backspace to a menu item filtering
+       a new `electric-pair-delete-pair' command.
+       (electric-pair-delete-pair): New command.
+
+2014-04-06  João Távora  <joaotavora@gmail.com>
+
+       * progmodes/python.el (python-electric-pair-string-delimiter): Fix
+       triple-quoting electricity.  (Bug#17192)
+
+2014-04-06  João Távora  <joaotavora@gmail.com>
+
+       * elec-pair.el (electric-pair-post-self-insert-function): Don't
+       skip whitespace when `electric-pair-text-pairs' and
+       `electric-pair-pairs' were used. syntax to
+       electric-pair--skip-whitespace.  (Bug#17183)
+
+2014-04-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * leim/quail/ipa.el (ipa-x-sampa): Fix the character produced for
+       "<F>".  (Bug#17199)
+
+2014-04-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * mpc.el (mpc--status-timer-run): Disable timer if not displayed.
+       (mpc--status-idle-timer-run): Use mpc--status-timer-run.
+
+2014-04-05  Glenn Morris  <rgm@gnu.org>
+
+       * help.el (view-lossage): Doc tweak.
+
+2014-04-05  Matthias Dahl  <ml_emacs-lists@binary-island.eu>
+
+       * faces.el (face-spec-recalc): Call make-face-x-resource-internal
+       only when inhibit-x-resources is nil, and do that earlier in the
+       function.  Doc fix.  (Bug#16694)
+       (face-spec-choose): Accept additional optional argument, whose
+       value is returned if no matching attributes are found.
+       (face-spec-recalc): Use the new optional argument when calling
+       face-spec-choose.  (Bug#16378)
+       (make-face-x-resource-internal): Do nothing when
+       inhibit-x-resources is non-nil.  Don't touch the default face if
+       reversed video is given--as was done in previous versions of Emacs.
+       (face-set-after-frame-default): Don't call
+       make-face-x-resource-internal here.  (Bug#16434)
+
+2014-04-04  Tassilo Horn  <tsdh@gnu.org>
+
+       * doc-view.el (doc-view-bookmark-jump):
+       Use `bookmark-after-jump-hook' to jump to the right page after the
+       buffer is shown in a window.  (bug#16090)
+
+2014-04-04  Eli Zaretskii  <eliz@gnu.org>
+
+       * international/characters.el (mirroring): Fix last change:
+       instead of loading uni-mirrored.el explicitly, do that implicitly
+       by creating the 'mirroring' uniprop table.  This avoids announcing
+       the loading of uni-mirrored.el.
+
+2014-04-04  Glenn Morris  <rgm@gnu.org>
+
+       * files.el (buffer-stale--default-function)
+       (buffer-stale-function, revert-buffer--default):
+       * autorevert.el (auto-revert-buffers): Doc tweaks.
+
+2014-04-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * international/characters.el: Preload uni-mirrored.el.  (Bug#17169)
+
+2014-04-03  Glenn Morris  <rgm@gnu.org>
+
+       * files.el (make-backup-file-name-function)
+       (make-backup-file-name, make-backup-file-name--default-function)
+       (make-backup-file-name-1, find-backup-file-name)
+       (revert-buffer-function, revert-buffer-insert-file-contents-function)
+       (buffer-stale--default-function, buffer-stale-function)
+       (before-revert-hook, after-revert-hook, revert-buffer-in-progress-p)
+       (revert-buffer, revert-buffer--default)
+       (revert-buffer-insert-file-contents--default-function):
+       Doc fixes related to defaults no longer being nil.
+       (make-backup-file-name-function): Bump :version.
+       Restore nil as a valid but deprecated custom type.
+
+2014-04-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/perl-mode.el (perl-syntax-propertize-function): Handle $'
+       used as a variable (bug#17174).
+
+2014-04-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/perl-mode.el (perl-indent-new-calculate):
+       Handle forward-sexp failure (bug#16985).
+       (perl-syntax-propertize-function): Add "foreach" and "for" statement
+       modifiers introducing expressions (bug#17116).
+
+2014-04-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * dired-aux.el (dired-file-set-difference): Use lexical-scoping.
+
+2014-04-05  Leo Liu  <sdl.web@gmail.com>
+
+       * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression):
+       Add define-compilation-mode.
+
+2014-04-04  João Távora  <joaotavora@gmail.com>
+
+       * elec-pair.el (electric-pair--syntax-ppss): When inside comments
+       parse from comment beginning.
+       (electric-pair--balance-info): Fix typo in comment.
+       (electric-pair--in-unterminated-string-p): Delete.
+       (electric-pair--unbalanced-strings-p): New function.
+       (electric-pair-string-bound-function): New var.
+       (electric-pair-inhibit-if-helps-balance): Decide quote pairing
+       according to `electric-pair--in-unterminated-string-p'.
+
+2014-04-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * textmodes/reftex-parse.el (reftex--index-tags): Rename `index-tags'.
+       Move declaration before first use.
+       (reftex-move-to-next-arg): Silence compiler warning.
+
+2014-04-04  Joost Kremers  <joostkremers@fastmail.fm>  (tiny change)
+
+       * textmodes/reftex-toc.el (reftex-toc, reftex-re-enlarge):
+       Use `window-total-width' instead of `window-width'.
+
+2014-04-03  Daniel Colascione  <dancol@dancol.org>
+
+       * subr.el (set-transient-map): Remove rms's workaround entirely;
+       use new `suspicious-object' subr to mark our lambda for closer
+       scrutiny during gc.
+
+2014-04-02  Richard Stallman  <rms@gnu.org>
+
+       * subr.el (set-transient-map): Comment out previous change.
+
+2014-04-02  Glenn Morris  <rgm@gnu.org>
+
+       * menu-bar.el (menu-bar-file-menu):
+       * vc/ediff.el (ediff-current-file):
+       Update for revert-buffer-function no longer being nil by default.
+
+       * simple.el (command-execute): Respect nil disabled-command-function.
+
+2014-04-02  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
+
+       * simple.el (command-execute): Do not execute the command when it
+       is disabled; fixes thinko in 2013-02-20 conversion from C.  (Bug#17151)
+
+2014-04-02  Juri Linkov  <juri@jurta.org>
+
+       * dired-aux.el (dired-compress-file): Don't use string-match-p
+       because its match data is used afterwards.
+
+2014-04-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/package.el (package-built-in-p): Treat a min-version of
+       0 like nil.
+
+2014-04-02  João Távora  <joaotavora@gmail.com>
+
+       * elec-pair.el (electric-pair-inhibit-if-helps-balance):
+       Inhibit quote pairing if point-max is inside an unterminated string.
+       (electric-pair--looking-at-unterminated-string-p):
+       Delete.
+       (electric-pair--in-unterminated-string-p): New function.
+
+2014-04-01  Daniel Colascione  <dancol@dancol.org>
+
+       * minibuffer.el (minibuffer-complete): Prevent assertion failure
+       when trying to complete the prompt.
+
+2014-03-31  Leo Liu  <sdl.web@gmail.com>
+
+       * emacs-lisp/eldoc.el (eldoc-print-current-symbol-info):
+       Refactor out eldoc-documentation-function-default.
+       (eldoc-documentation-function-default): New function.
+       (eldoc-documentation-function): Change value.
+
+2014-03-31  Glenn Morris  <rgm@gnu.org>
+
+       * simple.el (cycle-spacing--context, cycle-spacing): Doc tweaks.
+
+       * progmodes/vhdl-mode.el (vhdl-speedbar-select-mra)
+       (vhdl-compose-components-package, vhdl-compose-configuration):
+       Abbreviate default-directory (missing from some previous upstream sync).
+
+2014-03-31  Reto Zimmermann  <reto@gnu.org>
+
+       Sync with upstream vhdl mode v3.35.2.
+       * progmodes/vhdl-mode.el (vhdl-version, vhdl-time-stamp): Update.
+       (top-level): No longer require assoc.
+       (vhdl-asort, vhdl-anot-head-p, vhdl-aput, vhdl-adelete, vhdl-aget):
+       New functions.  Use throughout to replace aget etc.
+       (vhdl-aput-delete-if-nil): Rename from vhdl-aput.
+       (vhdl-update-file-contents): Update for vhdl-aput-delete-if-nil rename.
+       (vhdl-template-replace-header-keywords): Fix bug for "<title string>".
+       (vhdl-compile-init): Do not initialize regexps for Emacs 22+.
+       (vhdl-error-regexp-emacs-alist): Remove regexps from all compilers
+       except `vhdl-compiler'.
+       (vhdl-error-regexp-add-emacs): Remove all other compilers,
+       when appropriate.
+
+2014-03-31  Glenn Morris  <rgm@gnu.org>
+
+       * progmodes/vhdl-mode.el (vhdl-expand-abbrev, vhdl-expand-paren):
+       Revert 2014-03-26 merge goof; go back to using defalias.
+
+2014-03-30  Daniel Colascione  <dancol@dancol.org>
+
+       * comint.el (comint-send-input):
+       Deactivate completion-in-region-mode before we send comint input.
+       (Bug#17139).
+
+       * simple.el (keyboard-quit): Deactivate completion-in-region-mode
+       on keyboard-quit.
+
+2014-03-29  Glenn Morris  <rgm@gnu.org>
+
+       * textmodes/reftex.el: Manage most autoloads automatically.
+       * textmodes/reftex-auc.el, textmodes/reftex-cite.el:
+       * textmodes/reftex-dcr.el, textmodes/reftex-global.el:
+       * textmodes/reftex-index.el, textmodes/reftex-parse.el:
+       * textmodes/reftex-ref.el, textmodes/reftex-sel.el:
+       * textmodes/reftex-toc.el: Set generated-autoload-file,
+       and add autoload cookies for reftex.el.
+       * Makefile.in (AUTOGEN_VCS): Add textmodes/reftex.el.
+
+2014-03-28  Glenn Morris  <rgm@gnu.org>
+
+       * cus-start.el (report-emacs-bug-address): Set custom properties.
+       * mail/emacsbug.el (report-emacs-bug-address):
+       Variable is now defined in emacs.c.
+
+       * mail/emacsbug.el (report-emacs-bug):
+       Include system-configuration-features.
+
+2014-03-28  Michal Nazarewicz  <mina86@mina86.com>
+
+       * simple.el (cycle-spacing): Never delete spaces on first run by
+       default, but do so in a new 'fast mode and if there are already
+       N spaces (the previous behavior).
+       Compare N with its value in previous invocation so that changing
+       prefix argument restarts `cycle-spacing' sequence.
+       The idea is that with this change, binding M-SPC to
+       `cycle-spacing' should not introduce any changes in behavior of
+       the binding so long as users do not type M-SPC twice in a raw with
+       the same prefix argument or lack thereof.
+
+2014-03-28  Glenn Morris  <rgm@gnu.org>
+
+       * faces.el (term-file-aliases): New variable.
+       (tty-run-terminal-initialization): Respect term-file-aliases.
+       * term/apollo.el, term/vt102.el, term/vt125.el, term/vt201.el:
+       * term/vt220.el, term/vt240.el, term/vt300.el, term/vt320.el:
+       * term/vt400.el, term/vt420.el: Remove files, replaced by aliases.
+
+2014-03-27  Glenn Morris  <rgm@gnu.org>
+
+       * startup.el (inhibit-startup-hooks): Doc tweak.
+       (normal-top-level): Simplify running of hooks.
+       For window-setup-hook, respect inhibit-startup-hooks.
+       (command-line-1): Don't set window-setup-hook to nil.
+
+       Allow selective autoloading from obsolete/ directory.
+       * Makefile.in (obsolete-autoloads): New rule.
+       (autoloads): Run obsolete-autoloads.
+       * obsolete/iswitchb.el (iswitchb-mode): Use obsolete-autoload.
+       * simple.el (iswitchb-mode): Remove hand-written autoloads.
+
+2014-03-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords):
+       Highlight special globals with font-lock-builtin-face.  (Bug#17057)
+
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-function):
+       Don't propertize `?' or `!' as symbol constituent when after
+       colon.  (Bug#17097)
+
+2014-03-27  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frameset.el (frameset--restore-frame): Remove workaround for bug#14795
+       which is no longer needed and causes trouble in GTK builds (bug#17046).
+
+       * emacs-lisp/package-x.el (package--archive-contents-from-url):
+       Use url-insert-file-contents; package-handle-response no longer exists.
+
+2014-03-26  Daniel Colascione  <dancol@dancol.org>
+
+       * simple.el (process-menu-mode-map): New variable.
+       (process-menu-delete-process): New command.
+
 2014-03-26  Juanma Barranquero  <lekktu@gmail.com>
 
        * emacs-lisp/package.el: Fix bug#16733 (again).
        dynamic binding of `buffer'.
        (describe-package-1): Do not decode readme-string.
 
-2014-03-25  Barry O'Reilly  <gundaetiapo@gmail.com>
-
-       * simple.el (primitive-undo): Correction to 2014-03-24 change.
-
-2014-03-25  Michael Albinus  <michael.albinus@gmx.de>
+2014-03-26  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-methods, tramp-connection-timeout): Fix docstring.
 
        (tramp-do-copy-or-rename-file-directly): In the `rename' case,
        check whether source directory has set the sticky bit.
 
-2014-03-24  Barry O'Reilly  <gundaetiapo@gmail.com>
+2014-03-26  Barry O'Reilly  <gundaetiapo@gmail.com>
 
        * simple.el (primitive-undo): Only process marker adjustments
        validated against their corresponding (TEXT . POS).  Issue warning
        (undo-elt-in-region): Return nil when passed a marker adjustment
        and explain in function doc.
 
-2014-03-24  Dmitry Gutov  <dgutov@yandex.ru>
-
-       * emacs-lisp/package.el (package--add-to-archive-contents):
-       Include already installed and built-in packages in
-       `package-archive-contents'.
-       (package-install): Don't include already installed packages in the
-       options during interactive invocation.  (Bug#16762)
-
-2014-03-24  Daniel Colascione  <dancol@dancol.org>
-
-       * emacs-lisp/cl-macs.el (cl--do-arglist): Use `plist-member'
-       instead of cl-loop search function.
-
-2014-03-24  Juanma Barranquero  <lekktu@gmail.com>
-
-       * frameset.el (frameset--initial-params): Fix typo in parameter name.
-
-2014-03-24  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
+2014-03-26  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
 
        * align.el (align-region): Do not fail when end-mark is nil (bug#17088).
 
-2014-03-24  Dmitry Gutov  <dgutov@yandex.ru>
+2014-03-26  Dmitry Gutov  <dgutov@yandex.ru>
 
        * progmodes/ruby-mode.el (ruby-expression-expansion-re):
        Match special global variables without curlies, too.
        variables.  Don't require a non-word character after the variable.
        (Bug#17057)
 
-2014-03-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+2014-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (redisplay-highlight-region-function): Increase priority of
        overlay to make sure boundaries are visible (bug#15899).
 
-2014-03-23  Juanma Barranquero  <lekktu@gmail.com>
+2014-03-26  Juanma Barranquero  <lekktu@gmail.com>
 
-       * frameset.el (frameset-restore): Compare display strings with equal.
+       * frameset.el (frameset--initial-params): Fix typo in parameter name.
+       (frameset-restore): Compare display strings with equal.
 
        * frame.el (make-frame): Don't quote display name in error message,
        it is already a string.
 
-2014-03-23  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+2014-03-26  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
        * net/tramp.el (tramp-read-passwd): Suspend the timers while reading
        the password.
 
-2014-03-23  Dmitry Gutov  <dgutov@yandex.ru>
+2014-03-26  Dmitry Gutov  <dgutov@yandex.ru>
 
-       * emacs-lisp/package.el (package-show-package-list): If the buffer
-       is already displayed in another window, switch to that window.
+       * emacs-lisp/package.el (package--add-to-archive-contents):
+       Include already installed and built-in packages in
+       `package-archive-contents'.
+       (package-install): Don't include already installed packages in the
+       options during interactive invocation.  (Bug#16762)
+       (package-show-package-list): If the buffer is already displayed in
+       another window, switch to that window.
+
+2014-03-26  Reto Zimmermann  <reto@gnu.org>
+
+       Sync with upstream vhdl mode v3.35.1.
+       * progmodes/vhdl-mode.el (vhdl-version, vhdl-time-stamp): Update.
+       (vhdl-compiler-alist): Doc fix.
+       (vhdl-goto-line): Remove.
+       (vhdl-mode-abbrev-table-init): Add XEmacs compat.
+       (vhdl-mode) <paragraph-start>: Fix value.
+       (vhdl-fix-statement-region): Not `for' in wait-statement.
+       (vhdl-beautify-region): Also (un)tabify.
+       (vhdl-get-visible-signals):
+       Scan declarative part of generate statements.
+       (vhdl-template-record): Fix indentation for record type declaration.
+       (vhdl-expand-abbrev, vhdl-expand-paren):
+       Revert to using fset again rather than defalias.
+       (vhdl-scan-directory-contents): Tweak.
+       (vhdl-speedbar-find-file, vhdl-speedbar-port-copy)
+       (vhdl-compose-components-package):
+       Replace vhdl-goto-line with forward-line.
+       (top-level): Tweak speedbar frame selection.
+       (vhdl-generate-makefile-1): Support for compilers with no
+       unit-to-file name mapping (create directory with dummy files).
+
+2014-03-26  Wilson Snyder  <wsnyder@wsnyder.org>
+
+       Sync with upstream verilog-mode revision 702457d.
+       * progmodes/verilog-mode.el (verilog-mode-version): Update.
+       (create-lockfiles): Declare.
+       (verilog-read-decls): Fix module header imports, bug709.
+       Reported by Victor Lau.
+       Fix parsing 'var' in AUTOs, msg1294.  Reported by Dominique Chen.
+       (verilog-auto-inout-module): Fix AUTOINOUTMODULE not inserting
+       interface-only modules, bug721.  Reported by Dean Hoyt.
 
-2014-03-21  Daniel Colascione  <dancol@dancol.org>
+2014-03-26  Glenn Morris  <rgm@gnu.org>
 
-       * mail/emacsbug.el (report-emacs-bug): Include memory usage
-       information in bug reports.
+       * obsolete/gulp.el: Move here from emacs-lisp/.
+
+       * files.el (lock-buffer, unlock-buffer, file-locked-p):
+       Remove fallback aliases, since they are always defined now.
+
+2014-03-24  Daniel Colascione  <dancol@dancol.org>
+
+       * emacs-lisp/cl-macs.el (cl--do-arglist): Use `plist-member'
+       instead of cl-loop search function.
+
+2014-03-23  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * calendar/parse-time.el (parse-time-iso8601-regexp)
+       (parse-iso8601-time-string): Copied from `url-dav' so that we can use
+       it more generally.
+
+2014-03-23  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * net/dns.el (network-interface-list): Define for XEmacs.
+
+2014-03-23  Magnus Henoch  <magnus.henoch@gmail.com>
+
+       * net/dns.el (dns-servers-up-to-date-p): New function to see whether
+       the network interfaces changed.
+       (dns-query): Use it to flush the data.
+
+2014-03-23  Juanma Barranquero  <lekktu@gmail.com>
+
+       * vc/vc.el (vc-rollback): Use set-buffer-modified-p.
+
+2014-03-23  Daniel Colascione  <dancol@dancol.org>
+
+       Change subword-mode to use `find-word-boundary-function-table' and
+       replace `capitalized-words-mode'.  Also, convert to lexical
+       binding.
+
+       * progmodes/cap-words.el: Delete now-obsolete file.
+       * progmodes/subword.el: Reimplement using
+       `find-word-boundary-function-table'.
+       (subword-mode-map): Hollow out.
+       (capitalized-words-mode): Define as obsolete alias for
+       `subword-mode'.
+       (subword-mode, superword-mode): Tweak documentation to reflect new
+       implementation; call `subword-setup-buffer'.
+       (subword-forward, subword-capitalize): Add underscore to indicate
+       unused variable.
+       (subword-find-word-boundary-function-table): New constant.
+       (subword-empty-char-table): New constant.
+       (subword-setup-buffer): New function.
+       (subword-find-word-boundary): New function.
 
 2014-03-23  Daniel Colascione  <dancol@dancol.org>
 
        (Bug#3647) --- unfortunately, only for freshly-compiled code.
        Please make bootstrap.
 
-2014-03-23  Richard Stallman  <rms@gnu.org>
-
-       * battery.el (battery-linux-sysfs): Search for each field
-       from the beginning of the buffer.
+2014-03-22  Glenn Morris  <rgm@gnu.org>
+
+       * dired.el (dired-read-regexp): Make obsolete.
+       (dired-mark-files-regexp, dired-mark-files-containing-regexp)
+       (dired-flag-files-regexp):
+       * dired-aux.el (dired-mark-read-regexp):
+       * dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.
+
+       * startup.el (fancy-startup-text):
+       * help.el (describe-gnu-project): Visit online info about GNU project.
+
+       * help-fns.el (help-fns--interactive-only): New function.
+       (help-fns-describe-function-functions): Add the above function.
+       * simple.el (beginning-of-buffer, end-of-buffer, insert-buffer)
+       (next-line, previous-line): Remove hand-written interactive-only
+       information from doc strings, it is auto-generated now.
+       * bookmark.el (bookmark-write):
+       * epa-mail.el (epa-mail-decrypt, epa-mail-verify, epa-mail-sign)
+       (epa-mail-import-keys): Mark interactive-only,
+       and remove hand-written interactive-only information from doc strings.
+       * epa.el (epa-decrypt-armor-in-region, epa-verify-region)
+       (epa-verify-cleartext-in-region, epa-sign-region, epa-encrypt-region):
+       * files.el (not-modified):
+       * simple.el (mark-whole-buffer): Mark interactive-only.
+
+       * emacs-lisp/byte-run.el (defun-declarations-alist):
+       Add interactive-only.  Doc tweak.
+       (macro-declarations-alist): Doc tweak.
+       * subr.el (declare): Doc tweak (add xref to manual).
+       * comint.el (comint-run):
+       * files.el (insert-file-literally, insert-file):
+       * replace.el (replace-string, replace-regexp):
+       * simple.el (beginning-of-buffer, end-of-buffer, delete-backward-char)
+       (delete-forward-char, goto-line, insert-buffer, next-line)
+       (previous-line): Set interactive-only via declare.
 
 2014-03-22  Dmitry Gutov  <dgutov@yandex.ru>
 
        * w32-common-fns.el (x-selection-owner-p): Add empty docstring for the
        benefit of doc.c; change parameter profile to match the X function.
 
+2014-03-22  Leo Liu  <sdl.web@gmail.com>
+
+       * help.el (temp-buffer-setup-hook): Remove help-mode-setup.
+       (temp-buffer-show-hook): Remove help-mode-finish.  (Bug#16038)
+
+2014-03-21  Richard Stallman  <rms@gnu.org>
+
+       * battery.el (battery-linux-sysfs): Search for each field
+       from the beginning of the buffer.
+
+       * subr.el (set-transient-map): Clear out function and value
+       of the temporary symbol when we're done with it.
+
+       * mail/rmailsum.el (rmail-summary-delete-forward):
+       Optimize case of reaching end and handling count.
+       (rmail-summary-mark-deleted): Optimize when N is current msg.
+       Don't create new summary line.
+       (rmail-summary-undelete): Pass arg to rmail-undelete-previous-message.
+       (rmail-summary-undelete-many): Rewrite for speed.
+       (rmail-summary-msg-number): New function.
+
+       * mail/rmail.el (rmail-delete-message): Update summary.
+       (rmail-undelete-previous-message): Handle repeat count arg.
+       (rmail-delete-backward, rmail-delete-forward): Likewise.
+
+2014-03-21  Daniel Colascione  <dancol@dancol.org>
+
+       * mail/emacsbug.el (report-emacs-bug): Include memory usage
+       information in bug reports.
+
 2014-03-21  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-methods): Add docstring for `tramp-login-env'
        (electric-indent-mode): Don't mess with the global map any more.
        Don't drop the post-self-insert-hook is some buffer is still using it
        (bug#16770).
+
        * bindings.el (global-map): Remove C-j binding.
 
        * emacs-lisp/nadvice.el (advice--make-docstring): Try harder to find
        the docstring of functions advised before dumping (bug#16993).
 
+2014-03-21  Glenn Morris  <rgm@gnu.org>
+
+       * cus-start.el (history-length): Bump :version.
+
+       * Makefile.in ($(MH_E_DIR)/mh-loaddefs.el)
+       ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
+       ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
+       Don't set `make-backup-files'.
+
+       * info.el (info--prettify-description): New function,
+       to give info-finder descriptions consistent case, punctuation.
+       (Info-finder-find-node): Use it.  Sort packages.
+       Refer to "description" rather than "commentary".
+
+2014-03-21  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frameset.el (frameset--print-register): New function.
+       (frameset-to-register): Use it.
+
+2014-03-20  Juanma Barranquero  <lekktu@gmail.com>
+
+       * progmodes/hideif.el (hif-string-to-number): New function.
+       (hif-tokenize): Use it to understand non-decimal floats.
+
+       * emacs-lisp/cl-extra.el (cl--map-overlays): Remove obsolete code.
+
+       * skeleton.el (skeleton-autowrap): Mark as obsolete.  Doc fix.
+
 2014-03-19  Stefan-W. Hahn  <stefan.hahn@s-hahn.de>  (tiny change)
 
        * ps-print.el (ps-generate-postscript-with-faces):
        * net/shr.el (shr-tag-img): Prefer the title over the alt text
        (bug#16537).
 
->>>>>>> MERGE-SOURCE
 2014-01-24  Juanma Barranquero  <lekktu@gmail.com>
 
        * net/eww.el (eww-download-callback):
 
        * rect.el (rectangle-mark-mode): Rename from rectangle-mark.
        Make it into a proper minor mode.
-       (rectangle--region): (implicitly) rename to rectangle-mark-mode.
+       (rectangle--region): (Implicitly) rename to rectangle-mark-mode.
        (rectangle-mark-mode-map): New keymap.
        (rectangle--highlight-for-redisplay): Fix some corner cases (bug#15796).
 
 
 2013-10-28  Daiki Ueno  <ueno@gnu.org>
 
-       * epa-file.el
-       (epa-file-cache-passphrase-for-symmetric-encryption):
+       * epa-file.el (epa-file-cache-passphrase-for-symmetric-encryption):
        Document that this option has no effect with GnuPG 2.0 (bug#15552).
 
 2013-10-27  Xue Fuqiao  <xfq.free@gmail.com>
        * textmodes/reftex-vars.el (reftex-ref-style-alist):
        Add cleveref macros.
 
-       * textmodes/reftex-parse.el
-       (reftex-locate-bibliography-files): Accept options for
-       bibliography commands.
+       * textmodes/reftex-parse.el (reftex-locate-bibliography-files):
+       Accept options for bibliography commands.
        * textmodes/reftex-vars.el (reftex-bibliography-commands):
        Add addbibresource.  Basic Biblatex support.
 
 2013-04-19  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
        New faster Imenu implementation (bug#14058).
-       * progmodes/python.el:
-       (python-imenu-prev-index-position):
+       * progmodes/python.el (python-imenu-prev-index-position)
        (python-imenu-format-item-label-function)
        (python-imenu-format-parent-item-label-function)
        (python-imenu-format-parent-item-jump-label-function):