commit 844de5015c8d5861af5daa83e75d6db74510fad4 (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Thu Oct 15 14:59:43 2015 -0700 New file etc/HISTORY * admin/FOR-RELEASE: Procedure for etc/HISTORY. * etc/HISTORY: New file. * etc/NEWS: Mention it. diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 327723f..6ecec89 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -107,6 +107,8 @@ sk Miroslav Vaško ** cusver-check from admin.el can help find new defcustoms missing :version tags. +** Add a line to etc/HISTORY for the release version number and date. + * BUGS ** Check for modes which bind M-s that conflicts with a new global binding M-s diff --git a/etc/HISTORY b/etc/HISTORY new file mode 100644 index 0000000..d19ca48 --- /dev/null +++ b/etc/HISTORY @@ -0,0 +1,154 @@ + GNU Emacs versions and their release dates + +For more details about release contents, see the NEWS* files. + +Dates are approximate in the following list; some are when the version +was made, some are when it was announced. + + +GNU Emacs 1.0 through 1.12 were released in early 1985. +The next release after 1.12 was 13. + +GNU Emacs 13 (1985-03-20) +Initial release announced on Usenet. + +GNU Emacs 15.10 (1985-04-10) + +GNU Emacs 15.34 (1985-05-07) +Last version 15 release. + +GNU Emacs 16.56 (1985-07-15) +First version 16 release. + +GNU Emacs 16.57 (1985-09-16) + +GNU Emacs 16.58 (1985-09-17) + +GNU Emacs 16.59 (1985-09-17) + +GNU Emacs 16.60 (1985-09-19) + +GNU Emacs 17.36 (1985-12-20) +First version 17 release. + +GNU Emacs 17.43 (1986-01-25) + +GNU Emacs 17.46 (1986-02-04) + +GNU Emacs 17.48 (1986-02-10) + +GNU Emacs 17.49 (1986-02-12) + +GNU Emacs 17.55 (1986-03-18) + +GNU Emacs 17.57 (1986-03-27) + +GNU Emacs 17.58 (1986-04-04) + +GNU Emacs 17.61 (1986-04-22) + +GNU Emacs 17.63 (1986-05-07) + +GNU Emacs 17.64 (1986-05-12) + +GNU Emacs 18.41 (1987-03-22) + +GNU Emacs 18.45 (1987-06-02) + +GNU Emacs 18.46 (1987-06-08) + +GNU Emacs 18.47 (1987-06-10) + +GNU Emacs 18.48 (1987-08-30) + +GNU Emacs 18.49 (1987-09-18) + +GNU Emacs 18.50 (1988-02-13) + +GNU Emacs 18.51 (1988-05-07) + +GNU Emacs 18.52 (1988-09-01) + +GNU Emacs 18.53 (1989-02-24) + +GNU Emacs 18.54 (1989-04-26) + +GNU Emacs 18.55 (1989-08-23) + +GNU Emacs 18.56 (1991-01-16) + +GNU Emacs 18.57 (1991-01-25) + +GNU Emacs 18.58 (1991-02-18) + +GNU Emacs 18.59 (1992-10-30) + +GNU Emacs 19.28 (1994-11-01) + +GNU Emacs 19.29 (1995-06-21) + +GNU Emacs 19.30 (1995-11-24) + +GNU Emacs 19.31 (1996-05-25) + +GNU Emacs 19.34 (1996-08-21) + +GNU Emacs 20.1 (1997-09-17) + +GNU Emacs 20.2 (1997-09-20) + +GNU Emacs 20.3 (1998-08-19) + +GNU Emacs 20.4 (1999-07-12) + +GNU Emacs 21.1 (2001-10-20) + +GNU Emacs 21.2 (2002-03-16) + +GNU Emacs 21.3 (2003-03-19) + +GNU Emacs 21.4 (2005-02-08) + +GNU Emacs 21.4a (2005-02-17) +This is Emacs 21.4 with an updated notice in etc/PROBLEMS. + +GNU Emacs 22.1 (2007-06-02) + +GNU Emacs 22.2 (2008-03-26) + +GNU Emacs 22.3 (2008-09-05) + +GNU Emacs 23.1 (2009-07-29) + +GNU Emacs 23.2 (2010-05-08) + +GNU Emacs 23.3 (2011-03-10) + +GNU Emacs 23.4 (2012-01-29) + +GNU Emacs 24.1 (2012-06-10) + +GNU Emacs 24.2 (2012-08-27) + +GNU Emacs 24.3 (2013-03-10) + +GNU Emacs 24.4 (2014-10-20) + +GNU Emacs 24.5 (2015-04-10) + + +---------------------------------------------------------------------- +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . diff --git a/etc/NEWS b/etc/NEWS index dbe0de3..7b31357 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -8,6 +8,7 @@ If possible, use M-x report-emacs-bug. This file is about changes in Emacs version 25. +See file HISTORY for a list of GNU Emacs versions and release dates. See files NEWS.24, NEWS.23, NEWS.22, NEWS.21, NEWS.20, NEWS.19, NEWS.18, and NEWS.1-17 for changes in older Emacs versions. commit 360d1d8caa1db0ffa7d0c02d4f03a4c921155c5a Author: Dmitry Gutov Date: Thu Oct 15 22:34:18 2015 +0300 js-mode: Don't misindent generator methods * lisp/progmodes/js.el (js--looking-at-operator-p): Distinguish generator methods from multiplication operator (https://github.com/mooz/js2-mode/issues/275). diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index f214015..5a4f383 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1751,11 +1751,18 @@ This performs fontification according to `js--class-styles'." "Return non-nil if point is on a JavaScript operator, other than a comma." (save-match-data (and (looking-at js--indent-operator-re) - (or (not (looking-at ":")) + (or (not (eq (char-after) ?:)) (save-excursion (and (js--re-search-backward "[?:{]\\|\\_" nil t) - (looking-at "?"))))))) - + (eq (char-after) ??)))) + (not (and + (eq (char-after) ?*) + (looking-at (concat "\\* *" js--name-re " *(")) + (save-excursion + (goto-char (1- (match-end 0))) + (let (forward-sexp-function) (forward-sexp)) + (js--forward-syntactic-ws) + (eq (char-after) ?{))))))) (defun js--continued-expression-p () "Return non-nil if the current line continues an expression." diff --git a/test/indent/js.js b/test/indent/js.js index 2120233..d897b9f 100644 --- a/test/indent/js.js +++ b/test/indent/js.js @@ -69,6 +69,13 @@ baz(`http://foo.bar/${tee}`) are kept unchanged!` +class A { + * x() { + return 1 + * 2; + } +} + // Local Variables: // indent-tabs-mode: nil // js-indent-level: 2 commit b4c00f9ac9d57eca8f2a4950fca6198065dbdcd0 Author: Paul Eggert Date: Thu Oct 15 10:51:25 2015 -0700 Fix animation timeout delay calculation * lisp/image.el (image-animate-timeout): Don’t assume speed is floating-point. diff --git a/lisp/image.el b/lisp/image.el index d557e39..295b79f 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -735,7 +735,7 @@ for the animation speed. A negative value means to animate in reverse." ;; Subtract off the time we took to load the image from the ;; stated delay time. (delay (max (+ (* (or (cdr animation) image-default-frame-delay) - (/ 1 (abs speed))) + (/ 1.0 (abs speed))) time (- (float-time))) image-minimum-frame-delay)) done) commit 5110c952069e593cb95593f7b3c41d67cb4559d6 Author: Mark Oteiza Date: Thu Oct 15 12:32:59 2015 -0400 Add commands for controlling MPD modes * lisp/mpc.el (mpc-cmd-consume, mpc-cmd-random, mpc-cmd-repeat) (mpc-cmd-single): New functions. (mpc-consume, mpc-repeat, mpc-single, mpc-shuffle): New commands. (mpc-mode-menu): Add new commands as menu items. diff --git a/lisp/mpc.el b/lisp/mpc.el index 55123ef..8cbea4f 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -796,6 +796,22 @@ The songs are returned as alists." ;; (setq mpc-queue-back nil mpc-queue nil) ) +(defun mpc-cmd-consume (&optional arg) + "Set consume mode state." + (mpc-proc-cmd (list "consume" arg) #'mpc-status-refresh)) + +(defun mpc-cmd-random (&optional arg) + "Set random (shuffle) mode state." + (mpc-proc-cmd (list "random" arg) #'mpc-status-refresh)) + +(defun mpc-cmd-repeat (&optional arg) + "Set repeat mode state." + (mpc-proc-cmd (list "repeat" arg) #'mpc-status-refresh)) + +(defun mpc-cmd-single (&optional arg) + "Set single mode state." + (mpc-proc-cmd (list "single" arg) #'mpc-status-refresh)) + (defun mpc-cmd-pause (&optional arg callback) "Pause or resume playback of the queue of songs." (let ((cb callback)) @@ -1121,6 +1137,16 @@ If PLAYLIST is t or nil or missing, use the main playlist." ["Play/Pause" mpc-toggle-play] ["Next Track" mpc-next] ["Previous Track" mpc-prev] + "--" + ["Repeat Playlist" mpc-repeat :style toggle + :selected (member '(repeat . "1") mpc-status)] + ["Shuffle Playlist" mpc-shuffle :style toggle + :selected (member '(random . "1") mpc-status)] + ["Repeat Single Track" mpc-single :style toggle + :selected (member '(single . "1") mpc-status)] + ["Consume Mode" mpc-consume :style toggle + :selected (member '(consume . "1") mpc-status)] + "--" ["Add new browser" mpc-tagbrowser] ["Update DB" mpc-update] ["Quit" mpc-quit])) @@ -2336,6 +2362,30 @@ This is used so that they can be compared with `eq', which is needed for (mpc-status-stop) (if proc (delete-process proc)))) +(defun mpc-consume () + "Toggle consume mode: removing played songs from the playlist." + (interactive) + (mpc-cmd-consume + (if (string= "0" (cdr (assq 'consume (mpc-cmd-status)))) "1" "0"))) + +(defun mpc-repeat () + "Toggle repeat mode." + (interactive) + (mpc-cmd-repeat + (if (string= "0" (cdr (assq 'repeat (mpc-cmd-status)))) "1" "0"))) + +(defun mpc-single () + "Toggle single mode." + (interactive) + (mpc-cmd-single + (if (string= "0" (cdr (assq 'single (mpc-cmd-status)))) "1" "0"))) + +(defun mpc-shuffle () + "Toggle shuffling of the playlist (random mode)." + (interactive) + (mpc-cmd-random + (if (string= "0" (cdr (assq 'random (mpc-cmd-status)))) "1" "0"))) + (defun mpc-stop () "Stop playing the current queue of songs." (interactive) commit 59def59158f9c5081664253e30362d0061a2a64f Author: Dmitry Gutov Date: Thu Oct 15 12:18:16 2015 +0300 Refer to `(elisp)Basic Completion' in completing-read docstring * src/minibuf.c (Fcompleting_read): Refer to `(elisp)Basic Completion' in the docstring (bug#21644). diff --git a/src/minibuf.c b/src/minibuf.c index 4e5c17d..2cde8b0 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1595,7 +1595,7 @@ PROMPT is a string to prompt with; normally it ends in a colon and a space. COLLECTION can be a list of strings, an alist, an obarray or a hash table. COLLECTION can also be a function to do the completion itself. PREDICATE limits completion to a subset of COLLECTION. -See `try-completion' and `all-completions' for more details +See Info node `(elisp)Basic Completion' for more details on completion, COLLECTION, and PREDICATE. REQUIRE-MATCH can take the following values: