From: Juanma Barranquero Date: Wed, 2 Apr 2014 15:14:50 +0000 (+0200) Subject: Merge from emacs-24; up to 2014-03-28T01:39:30Z!rgm@gnu.org X-Git-Tag: emacs-25.0.90~2640^2~279 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=09aba8153a8297e415477dbfa9a8c7e999fb3457;p=emacs.git Merge from emacs-24; up to 2014-03-28T01:39:30Z!rgm@gnu.org --- 09aba8153a8297e415477dbfa9a8c7e999fb3457 diff --cc ChangeLog index 3572267857c,65e730fffd7..6612f178304 --- a/ChangeLog +++ b/ChangeLog @@@ -1,3 -1,8 +1,8 @@@ -2014-03-31 Glenn Morris ++2014-04-02 Glenn Morris + + * configure.ac: Make the final "Does Emacs use Gsettings" message + consistent with src/config.h. + 2014-03-31 Jan Djärv * configure.ac: Fix errors from previous checkin (GSettings check). diff --cc lisp/ChangeLog index 66ec9ab3dc4,b1c35a78937..294eb110691 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,118 -1,30 +1,141 @@@ + 2014-04-02 Glenn Morris + + * 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-01 Nicolas Richard ++2014-04-02 Nicolas Richard + + * 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-03-29 Juri Linkov ++2014-04-02 Juri Linkov + + * dired-aux.el (dired-compress-file): Don't use string-match-p + because its match data is used afterwards. + -2014-03-28 Stefan Monnier ++2014-04-02 Stefan Monnier + + * emacs-lisp/package.el (package-built-in-p): Treat a min-version of + 0 like nil. + +2014-04-02 João Távora + + * 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 + + * minibuffer.el (minibuffer-complete): Prevent assertion failure + when trying to complete the prompt. + +2014-03-31 Leo Liu + + * 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 + + * 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 + + 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 "". + (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-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 diff --cc lisp/dired.el index d234d724c67,b3c67343a15..5cff7891567 --- a/lisp/dired.el +++ b/lisp/dired.el @@@ -3867,7 -3863,7 +3867,7 @@@ Ask means pop up a menu for the user t ;;; Start of automatically extracted autoloads. - ;;;### (autoloads nil "dired-aux" "dired-aux.el" "edcfeacd242f6163e847594870855b9e") -;;;### (autoloads nil "dired-aux" "dired-aux.el" "1a8e2a4a9117ab3a2586aa001358d3fb") ++;;;### (autoloads nil "dired-aux" "dired-aux.el" "6969bb4414a8a31b91342ab922a94efb") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ diff --cc src/ChangeLog index 2f028c48247,18b643bfe28..6638325a434 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,60 -1,24 +1,79 @@@ + 2014-04-02 Martin Rudalics <rudalics@gmx.at> + + * xterm.c (x_new_font): Don't calculate non-toolkit scrollbar + width from font width (Bug#17163). + -2014-03-30 Martin Rudalics <rudalics@gmx.at> - + * frame.c (x_set_frame_parameters): Calculate default values of + new frame sizes only after all other frame parameters have been + processed (Bug#17142). + -2014-03-28 Ken Brown <kbrown@cornell.edu> ++2014-04-02 Ken Brown <kbrown@cornell.edu> + + * conf_post.h (SYSTEM_PURESIZE_EXTRA) [CYGWIN]: Set to 10000. + (Bug#17112) + -2014-03-28 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> ++2014-04-02 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * xterm.c (x_draw_image_glyph_string): Adjust image background + width accordingly when its x position is adjusted. (Bug#17115) + +2014-04-02 Dmitry Antipov <dmantipov@yandex.ru> + + * font.c (font_list_entities): Do not add empty vector to font cache. + (font_matching_entity): Likewise. If matching entity is found, insert + 1-item vector with this entity instead of entity itself (Bug#17125). + +2014-04-01 Paul Eggert <eggert@cs.ucla.edu> + + * fns.c (validate_subarray): Rename from validate_substring, + since it works for vectors too. New arg ARRAY. Optimize for the + non-nil case. Instead of returning bool, throw an error if out of + range, so that the caller needn't do that. All uses changed. + Report original values if out of range. + (Fsubstring, Fsubstring_no_properties, secure_hash): + Also optimize the case where FROM is 0 or TO is the size. + +2014-03-31 Dmitry Antipov <dmantipov@yandex.ru> + + * search.c (Freplace_match): Use make_specified_string. + * xterm.c, w32term.c (x_set_glyph_string_gc): Use emacs_abort + to catch bogus override face of glyph strings. + * fns.c (Fsubstring, Fsubstring_no_properties, secure_hash): + Move common substring range checking code to... + (validate_substring): ...this function. + +2014-03-31 Jan Djärv <jan.h.d@swipnet.se> + + * nsmenu.m (free_frame_tool_bar): Set wait_for_tool_bar = NO (Bug#16976) + +2014-03-30 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (updateFrameSize:): If waiting for the tool bar and tool + bar is zero height, just return (Bug#16976). + (initFrameFromEmacs:): Initialize wait_for_tool_bar. + + * nsterm.h (EmacsView): Add wait_for_tool_bar. + + * nsmenu.m (update_frame_tool_bar): Return early if view or toolbar + is nil. If waiting for toolbar to complete, force a redraw. + +2014-03-28 Glenn Morris <rgm@gnu.org> + + * emacs.c (emacs_version): Use PACKAGE_VERSION rather than VERSION. + (emacs_bugreport): New variable. + (usage_message): Use PACKAGE_BUGREPORT. + (syms_of_emacs) <report-emacs-bug-address>: New variable. + + * emacs.c (syms_of_emacs) <system-configuration-features>: New var. + +2014-03-27 Paul Eggert <eggert@cs.ucla.edu> + + Port recent signal-related changes to FreeBSD. + Problem reported by Herbert J. Skuhra. + * lisp.h (block_tty_out_signal, unblock_tty_out_signal): + Move decls from here ... + * syssignal.h: ... to here, so that lisp.h doesn't depend on signal.h. + 2014-03-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * w32term.c (x_draw_image_glyph_string): Fix computation of height