+2014-05-01 Glenn Morris <rgm@gnu.org>
+
+ * allout-widgets.el (allout-widgets-tally)
+ (allout-decorate-item-guides):
+ * menu-bar.el (menu-bar-positive-p):
+ * minibuffer.el (completion-pcm-complete-word-inserts-delimiters):
+ * progmodes/gdb-mi.el (gdbmi-same-start, gdbmi-is-number):
+ * progmodes/js.el (js--inside-param-list-p)
+ (js--inside-dojo-class-list-p, js--forward-destructuring-spec):
+ * progmodes/prolog.el (region-exists-p):
+ * progmodes/verilog-mode.el (verilog-scan-cache-ok-p):
+ * textmodes/reftex-parse.el (reftex-using-biblatex-p):
+ Doc fixes (replace `iff').
+
+2014-05-01 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * mpc.el (mpc-volume-mouse-set): Don't burp at the boundaries.
+
+2014-04-30 Eli Zaretskii <eliz@gnu.org>
+
+ * dired.el (dired-initial-position-hook, dired-initial-position):
+ Doc string fixes.
+
+2014-04-29 Glenn Morris <rgm@gnu.org>
+
+ * mail/rmail.el (rmail-quit): Handle killed summaries. (Bug#17283)
+
+2014-04-27 Matthias Dahl <matthias.dahl@binary-island.eu>
+
+ * faces.el (face-spec-recalc): Apply X resources only after the
+ defface spec has been applied. Thus, X resources are no longer
+ overriden by the defface spec which also fixes issues on win32 where
+ the toolbar coloring was wrong because it is set through X resources
+ and was (wrongfully) overriden. (Bug#16694)
+
+2014-04-28 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * textmodes/rst.el (electric-pair-pairs): Declare.
+ (rst-mode): Set it (bug#17131).
+
+2014-04-27 Juri Linkov <juri@jurta.org>
+
+ * desktop.el (desktop-value-to-string): Let-bind `print-length'
+ and `print-level' to nil. (Bug#17351)
+
+2014-04-25 Nicolas Richard <theonewiththeevillook@yahoo.fr>
+
+ * battery.el (battery-update): Handle the case where battery
+ status is "N/A" (bug#17319).
+
+2014-04-24 Eli Zaretskii <eliz@gnu.org>
+
+ * tooltip.el (tooltip-show-help-non-mode, tooltip-show-help):
+ Use equal-including-properties to compare help-echo strings (bug#17331).
+
+2014-04-24 Leo Liu <sdl.web@gmail.com>
+
+ * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):
+ Fix syntax for @. (Bug#17325)
+
+2014-04-24 Daniel Colascione <dancol@dancol.org>
+
+ * emacs-lisp/cl.el (gv): Require gv early to break eager
+ macro-expansion cycles.
+
+2014-04-23 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * simple.el (region-active-p): Check there's a mark (bug#17324).
+
+ * simple.el (completion-list-mode-map): Use choose-completion for the
+ mouse binding as well (bug#17302).
+ (completion-list-mode, completion-setup-function): Adjust docstring and
+ echo area message accordingly.
+ * progmodes/idlwave.el (idlwave-choose-completion): Adjust to new
+ calling convention of choose-completion.
+ * comint.el (comint-dynamic-list-completions):
+ * term.el (term-dynamic-list-completions): Accept choose-completion.
+
+ * progmodes/perl-mode.el (perl-syntax-propertize-function): Slash after
+ &, |, +, - and * can't be a division (bug#17317).
+
+2014-04-22 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * term/xterm.el (xterm--version-handler): Don't use modern xterm
+ features on gnome-terminal (bug#16988).
+
+2014-04-22 Michael Heerdegen <michael_heerdegen@web.de>
+
+ * dired.el (dired-insert-set-properties): Do not consider
+ subdirectory headings and empty lines to be information that
+ `dired-hide-details-mode' should hide. (Bug#17228)
+
+2014-04-22 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
+ Remove test messages.
+ (tramp-do-copy-or-rename-file-out-of-band): Do not quote `source'
+ and `target' twice.
+
+2014-04-21 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * dframe.el (dframe-get-focus): Remove `hook' argument (bug#17311).
+ * speedbar.el (speedbar-get-focus): Run the "hook" afterwards instead.
+
+ * emacs-lisp/cl-macs.el (cl--loop-let): Avoid `nil' as var name.
+
+2014-04-21 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-sh-handle-file-name-all-completions):
+ Set "IFS=" when using read builtin, in order to preserve spaces in
+ the file name. Add test messages for hunting a bug on hydra.
+ (tramp-get-ls-command): Undo using "-b" argument. It doesn't help.
+
+2014-04-21 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * progmodes/prog-mode.el (prettify-symbols--compose-symbol):
+ Don't prettify a word within a symbol.
+
+2014-04-20 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if
+ possible.
+
+2014-04-19 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * progmodes/sh-script.el (sh-smie--sh-keyword-p): Handle variable
+ assignments such as "case=hello" (bug#17297).
+
+2014-04-18 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp.el (tramp-run-real-handler, tramp-file-name-handler):
+ Do not autoload.
+ (tramp-file-name-handler, tramp-completion-file-name-handler):
+ Revert patch from 2014-04-10, it isn't necessary anymore.
+ (tramp-autoload-file-name-handler)
+ (tramp-register-autoload-file-name-handlers): New defuns.
+ (top): Autoload call of `tramp-register-autoload-file-name-handlers'.
+ (tramp-register-file-name-handlers): Remove also
+ `tramp-autoload-file-name-handler' from `file-name-handler-list'.
+ Do not autoload its invocation, but eval it after loading of 'tramp.
+
+ * net/tramp-adb.el (tramp-unload-hook): Unload `tramp-adb'.
+
+ * net/tramp-compat.el (tramp-unload-hook): Unload `tramp-loaddefs'.
+
+2014-04-16 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * nxml/nxml-mode.el (nxml-fontify-matcher): Make sure propertization
+ was done (bug#17264).
+ * nxml/xmltok.el (xmltok-scan-after-comment-open): Extend unclosed
+ comment to EOB.
+
+ * progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in
+ here-documents (bug#17262).
+
+2014-04-16 Eli Zaretskii <eliz@gnu.org>
+
+ * term/pc-win.el (x-list-fonts, x-get-selection-value):
+ Provide doc strings, as required by snarf-documentation.
+
+2014-04-15 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * ps-def.el (ps-generate-postscript-with-faces1): Use the new `sorted'
+ arg of overlays-at. Use `invisible-p'.
+
+ * obsolete/lucid.el (extent-at):
+ * htmlfontify.el (hfy-overlay-props-at): Use the new `sorted' arg of
+ overlays-at.
+ (hfy-fontify-buffer): Remove unused var `orig-ovls'.
+
+2014-04-14 João Távora <joaotavora@gmail.com>
+
+ * net/shr.el (shr-expand-url): Use `expand-file-name' for relative
+ links. (Bug#17217).
+
+2014-04-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
+
+ * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):
+ Use mapc to loop over a vector. (Bug#17257).
+
+2014-04-13 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-sh-handle-file-truename): Revert previous
+ patch, there are new problems with file names containing spaces.
+ Get rid of backticks. (Bug#17238)
+
+2014-04-13 João Távora <joaotavora@gmail.com>
+
+ * elec-pair.el (electric-pair--syntax-ppss): Simplify and fix
+ possible bug.
+
+2014-04-13 Eli Zaretskii <eliz@gnu.org>
+
+ * frame.el (blink-cursor-blinks, blink-cursor-blinks-done): Doc fixes.
+ (blink-cursor-mode): Mention customization variables and the
+ effect of 'blink-cursor-blinks'.
+
+2014-04-12 Barry O'Reilly <gundaetiapo@gmail.com>
+
+ * simple.el (undo): Prevent insertion of identity mapping into
+ undo-equiv-table so as undo-only does not inf loop in the presence
+ of consecutive nils in undo list.
+
+2014-04-12 Matthias Dahl <matthias.dahl@binary-island.eu>
+
+ * faces.el (make-face): Deprecate optional argument as it is no
+ longer needed/used since the conditional X resources handling
+ has been pushed down to make-face-x-resource-internal itself.
+ (make-empty-face): Don't pass optional argument to make-face.
+
+2014-04-12 Eli Zaretskii <eliz@gnu.org>
+
+ * international/characters.el <standard-case-table>: Add entries
+ for letters from the Coptic block u+2C80-u+2CFF. (Bug#17243)
+ Set category of Coptic characters be 'g' (Greek).
+
+2014-04-12 Leo Liu <sdl.web@gmail.com>
+
+ * progmodes/octave.el (completion-table-with-cache): Define if not
+ available.
+ (octave-goto-function-definition)
+ (octave-sync-function-file-names)
+ (octave-find-definition-default-filename): Backquote upattern for
+ compatibility.
+
+2014-04-11 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp-sh.el (tramp-sh-handle-file-truename): Quote the file
+ name twice due to backticks. (Bug#17238)
+
+2014-04-11 Glenn Morris <rgm@gnu.org>
+
+ * term/w32-win.el (x-win-suspend-error):
+ * term/x-win.el (x-win-suspend-error): Sync docs.
+
+2014-04-10 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ Ediff's overlay priorities cause more trouble than they solve.
+ * vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable.
+ (ediff-highest-priority): Remove function (bug#17234).
+ * vc/ediff-util.el (ediff-highlight-diff-in-one-buffer):
+ * vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer)
+ (ediff-set-fine-diff-properties-in-one-buffer): Don't mess with
+ overlay priorities.
+
+2014-04-10 Feng Li <fengli@gmail.com> (tiny change)
+
+ * progmodes/pascal.el (pascal-font-lock-keywords): Fix incorrect format
+ entry; use symbol boundaries to avoid mis-matches.
+
+2014-04-10 Michael Albinus <michael.albinus@gmx.de>
+
+ * net/tramp.el (tramp-file-name-handler)
+ (tramp-completion-file-name-handler): Avoid recursive loading.
+
+ * net/tramp-sh.el (tramp-make-copy-program-file-name):
+ Quote result also locally.
+
+2014-04-09 Dmitry Gutov <dgutov@yandex.ru>
+
+ * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more
+ Module methods. (Bug#17216)
+
+2014-04-08 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * help.el (describe-bindings): Fix buffer handling (bug#17210).
+ (describe-bindings-internal): Mark obsolete.
+
+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 <matthias.dahl@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)
2014-03-04 Michal Nazarewicz <mina86@mina86.com>
- * binding.el: Add comment describing why C-d binds to `delete-char'.
+ * bindings.el: Add comment describing why C-d binds to `delete-char'.
* simple.el (delete-forward-char): Mark as interactive-only.
2014-03-03 Juanma Barranquero <lekktu@gmail.com>
* ielm.el (ielm-mode-hook):
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook)
(lisp-interaction-mode-hook):
- * progmodes/cfengine.e (cfengine3-documentation-function):
+ * progmodes/cfengine.el (cfengine3-documentation-function):
Replace obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'.
2014-01-30 Stefan Monnier <monnier@iro.umontreal.ca>
* 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):