+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>
- * progmodes/python.el (python-electric-pair-string-delimiter): Fix
- triple-quoting electricity. (Bug#17192)
+ 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>
- * elec-pair.el (electric-pair-post-self-insert-function): Don't
- skip whitespace when `electric-pair-text-pairs' and
+ * 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)
* help.el (view-lossage): Doc tweak.
-2014-04-05 Matthias Dahl <ml_emacs-lists@binary-island.eu>
+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
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):
HCoop / bpt / emacs.git / blobdiff