From: Paul Eggert Date: Tue, 3 Mar 2015 22:38:53 +0000 (-0800) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2564^2~236 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=923602fefbfadd47e0b675d97aa1b28a16971da0;p=emacs.git Merge from origin/emacs-24 0077b36 # NEWS copyedits 3ca2ff3 * lisp/erc/erc.el (erc-rename-buffers): Doc fix. Add :version. b85523f * lisp/textmodes/flyspell.el (flyspell-duplicate-distance): decb48d Augment text-mode syntax table for a few special characters 8b3ba7a Improve docs of transient-mark-mode (Bug#19841) 72fd047 NEWS: Add section to include ERC changes a7254bb Improve string search in `flyspell-word-search-*`. (Bug#16800) Conflicts: etc/ChangeLog etc/NEWS lisp/ChangeLog lisp/erc/ChangeLog src/ChangeLog --- 923602fefbfadd47e0b675d97aa1b28a16971da0 diff --cc etc/ChangeLog index 99a74f942f2,41e44be9593..9c11e18fb69 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@@ -1,26 -1,8 +1,31 @@@ -2015-02-12 Kelvin White ++2015-03-03 Kelvin White + + * NEWS: Add section to include ERC changes + -2015-01-17 Eli Zaretskii ++2015-03-03 Eli Zaretskii +2015-03-02 Daniel Colascione + + * NEWS: Mention finalizers. + +2015-02-09 Gareth Rees (tiny change) + + * NEWS.24: Fix typo (bug#19820) + +2015-02-08 Artur Malabarba + + * NEWS: Document `comment-line'. + +2015-02-03 Artur Malabarba + + * NEWS: Document package.el's improved dependency-handling. + +2015-01-29 Francesc Rocher + + * images/splash.svg, images/splash.png: + * images/splash.pbm, images/splash.xpm, images/README: + Splash images refurbished. + +2015-01-28 Eli Zaretskii * tutorials/TUTORIAL.he: Use u+05f4 HEBREW PUNCTUATION GERSHAYIM instead of u+0022 QUOTATION MARK in Hebrew acronyms. diff --cc etc/NEWS index a94c4caac64,cec45fa8339..8509cc0030f --- a/etc/NEWS +++ b/etc/NEWS @@@ -22,27 -22,40 +22,49 @@@ When you add a new item, use the approp otherwise leave it unmarked. -* Changes in Emacs 24.5 - ---- -** The default value of `history-length' has increased to 100. +* Installation Changes in Emacs 25.1 +++ ++ +** Building Emacs now requires C99 or later. + + ** The variable `redisplay-dont-pause' is obsolete. + - -* Changes in Specialized Modes and Packages in Emacs 24.5 +** Building Emacs now requires GNU make, version 3.81 or later. +++ ** `call-process-shell-command' and `process-file-shell-command' don't take "&rest args" any more. +** By default, Emacs no longer works on IRIX. We expect that Emacs +users are not affected by this, as SGI stopped supporting IRIX in +December 2013. If you are affected, please send a bug report. You +should be able to work around the problem either by porting the Emacs +undumping code to GCC under IRIX, or by configuring --with-wide-int, +or by sticking with Emacs 24.4. + + ** ERC + +** 'configure' now prefers gnustep-config when configuring GNUstep. +If gnustep-config is not available, the old heuristics are used. + + +++ + *** New option `erc-rename-buffers'. + + --- + *** New faces `erc-my-nick-prefix-face' and `erc-nick-prefix-face'. + + +++ + *** `erc-format-@nick' displays all user modes instead of only op and voice. + + --- + *** The display of irc commands in the current buffer has been disabled. + + --- + *** `erc-version' now follows the Emacs version. + + ** Obsolete packages + --- *** cc-compat.el diff --cc lisp/ChangeLog index 69ccbfaa507,ef145390a24..47ddedae883 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,7 -1,27 +1,28 @@@ -2015-02-13 Glenn Morris ++2015-03-03 Glenn Morris + + * textmodes/flyspell.el (flyspell-duplicate-distance): + Bump :version. + -2015-02-13 Eli Zaretskii ++2015-03-03 Eli Zaretskii + + * textmodes/text-mode.el (text-mode-syntax-table): Make some + punctuation character behave as word-constituent, for more + compatibility with Unicode. + + * simple.el (transient-mark-mode): Doc fix. (Bug#19841) + -2015-02-12 Agustín Martín Domingo ++2015-03-03 Agustín Martín Domingo + + Improve string search in `flyspell-word-search-*`. (Bug#16800) + * flyspell.el (flyspell-duplicate-distance): Limit default search + distance for duplicated words to 40000. + (flyspell-word-search-backward, flyspell-word-search-forward): + Search as full word with defined casechars, not as substring. + -2015-02-10 Juri Linkov ++2015-03-03 Juri Linkov +2015-03-03 Juri Linkov Better support for the case of typing RET on the prompt in comint. - * comint.el (comint-get-old-input-default): Go to the field end when comint-use-prompt-regexp is nil. (comint-line-beginning-position): Check if point is already diff --cc lisp/erc/ChangeLog index 4c1c8432733,b8357d1de6b..f89d5a2d043 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@@ -1,24 -1,11 +1,32 @@@ -2015-02-13 Glenn Morris ++2015-03-03 Glenn Morris + + * erc.el (erc-rename-buffers): Doc fix. Add :version. + -2015-01-14 Dima Kogan ++2015-03-03 Dima Kogan + + * erc-backend.el (define-erc-response-handler): Give hook-name + default value of nil and add-to-list (bug#19363). +2015-02-14 Stefan Monnier + + * erc-spelling.el (erc-spelling-init): + Use flyspell-generic-check-word-predicate. + +2015-01-28 Dima Kogan + + * erc-backend.el (define-erc-response-handler): Give hook-name + default value of nil and add-to-list (bug#19363). + +2015-01-22 Paul Eggert + + Don't downcase system diagnostics' first letters + * erc-dcc.el (erc-dcc-server): Ignore case while comparing diagnostics. + +2014-11-23 Michael Albinus + + * erc-desktop-notifications.el (erc-notifications-bus): + New customer option. Supports cases when Emacs hasn't been + invoked in the same environment where the notifications shall go to. + (erc-notifications-notify): Use it. 2014-11-10 Kelvin White diff --cc lisp/textmodes/flyspell.el index ffaf7e753f4,e5d722cb8f3..8aadf51871f --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@@ -1030,18 -1044,30 +1046,32 @@@ Mostly we check word delimiters. ;;*---------------------------------------------------------------------*/ (defun flyspell-word-search-forward (word bound) (save-excursion - (let ((r '()) - (inhibit-point-motion-hooks t) - p) - (while (and (not r) (setq p (search-forward word bound t))) - (let ((lw (flyspell-get-word))) - (if (and (consp lw) (string-equal (car lw) word)) - (setq r p) - (goto-char (1+ p))))) + (let* ((r '()) + (inhibit-point-motion-hooks t) + (flyspell-not-casechars (flyspell-get-not-casechars)) + (bound (if (and bound + (< bound (point-max))) + (+ bound 1))) + (word-re (concat flyspell-not-casechars + (regexp-quote word) + "\\(?:" flyspell-not-casechars "\\|\\'\\)")) + p) + (while + (and (not r) + (setq p (and + (re-search-forward word-re bound t) + (if (eobp) + (point) + (backward-char) + (point))))) + (let ((lw (flyspell-get-word))) + (if (and (consp lw) (string-equal (car lw) word)) + (setq r p) + (goto-char (1+ p))))) r))) +(defvar flyspell-word) ;Backward compatibility; some predicates made use of it! + ;;*---------------------------------------------------------------------*/ ;;* flyspell-word ... */ ;;*---------------------------------------------------------------------*/ diff --cc src/ChangeLog index 2609ed7dd01,20d3fb34034..7a30c6e897a --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,4 -1,8 +1,9 @@@ -2015-02-13 Eli Zaretskii ++2015-03-03 Eli Zaretskii + + * buffer.c (syms_of_buffer): Doc fix. (Bug#19841) + -2015-02-08 Eli Zaretskii ++2015-03-03 Eli Zaretskii +2015-03-03 Eli Zaretskii * xfaces.c (map_tty_color): Use assoc_no_quit instead of assq_no_quit to fetch color definition by its string name.