Now on revision 112224. ------------------------------------------------------------ revno: 112224 committer: Jay Belanger branch nick: trunk timestamp: Thu 2013-04-04 21:20:35 -0500 message: * lisp/calc/calc.el (calc-allow-units-as-numbers): Move declaration. * lisp/calc/calc-units.el (calc-convert-units): Redo conditional. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-04 03:46:25 +0000 +++ lisp/ChangeLog 2013-04-05 02:20:35 +0000 @@ -1,3 +1,7 @@ +2013-04-05 Jay Belanger + + * calc/calc-units.el (calc-convert-units): Rewrite conditional. + 2013-04-04 Glenn Morris * electric.el (electric-pair-inhibit-predicate): Add :version. === modified file 'lisp/calc/calc-units.el' --- lisp/calc/calc-units.el 2013-03-08 02:11:25 +0000 +++ lisp/calc/calc-units.el 2013-04-05 02:20:35 +0000 @@ -437,7 +437,7 @@ (list new-units (car default-units)) math-default-units-table)))))) -(defvar calc-allow-units-as-numbers) +(defvar calc-allow-units-as-numbers t) (defun calc-convert-units (&optional old-units new-units) (interactive) @@ -451,7 +451,9 @@ defunits) (if (or (not (math-units-in-expr-p expr t)) (setq unitscancel (and - calc-allow-units-as-numbers + (if (get 'calc-allow-units-as-numbers 'saved-value) + (car (get 'calc-allow-units-as-numbers 'saved-value)) + calc-allow-units-as-numbers) (eq (math-get-standard-units expr) 1)))) (let ((uold (or old-units (progn === modified file 'lisp/calc/calc.el' --- lisp/calc/calc.el 2013-02-09 23:17:05 +0000 +++ lisp/calc/calc.el 2013-04-05 02:20:35 +0000 @@ -426,14 +426,6 @@ :version "24.3" :type 'boolean) -(defcustom calc-allow-units-as-numbers - t - "If non-nil, allow unit expressions to be treated like numbers -when converting units, if the expression can be simplified to be unitless." - :group 'calc - :version "24.4" - :type 'boolean) - (defcustom calc-undo-length 100 "The number of undo steps that will be preserved when Calc is quit." ------------------------------------------------------------ revno: 112223 author: Andrew Cohen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2013-04-04 22:15:25 +0000 message: gnus-msg.el: Fix detection of nnir group diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-04-04 02:35:55 +0000 +++ lisp/gnus/ChangeLog 2013-04-04 22:15:25 +0000 @@ -1,3 +1,10 @@ +2013-04-04 Andrew Cohen + + * nnir.el (gnus-nnir-group-p): New function. + (nnir-possibly-change-group): Use it. + + * gnus-msg.el (gnus-setup-message): Use it. + 2013-04-04 Katsumi Yamaoka * mml.el (mml-minibuffer-read-description): Use `default' insted of === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2013-04-03 17:07:50 +0000 +++ lisp/gnus/gnus-msg.el 2013-04-04 22:15:25 +0000 @@ -417,6 +417,7 @@ (autoload 'nnir-article-number "nnir" nil nil 'macro) (autoload 'nnir-article-group "nnir" nil nil 'macro) +(autoload 'gnus-nnir-group-p "nnir") (defvar gnus-article-reply nil) @@ -430,17 +431,15 @@ `(let ((,winconf (current-window-configuration)) (,winconf-name gnus-current-window-configuration) (,buffer (buffer-name (current-buffer))) - (,article (or (when (and - (string-match "^nnir:" gnus-newsgroup-name) - gnus-article-reply) - (nnir-article-number gnus-article-reply)) - gnus-article-reply)) + (,article (if (and (gnus-nnir-group-p gnus-newsgroup-name) + gnus-article-reply) + (nnir-article-number gnus-article-reply) + gnus-article-reply)) (,yanked gnus-article-yanked-articles) - (,group (or (when (and - (string-match "^nnir:" gnus-newsgroup-name) - gnus-article-reply) - (nnir-article-group gnus-article-reply)) - gnus-newsgroup-name)) + (,group (if (and (gnus-nnir-group-p gnus-newsgroup-name) + gnus-article-reply) + (nnir-article-group gnus-article-reply) + gnus-newsgroup-name)) (message-header-setup-hook (copy-sequence message-header-setup-hook)) (mbl mml-buffer-list) === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2013-04-01 22:54:32 +0000 +++ lisp/gnus/nnir.el 2013-04-04 22:15:25 +0000 @@ -1707,6 +1707,12 @@ ;;; Util Code: +(defun gnus-nnir-group-p (group) + "Say whether GROUP is nnir or not." + (if (gnus-group-prefixed-p group) + (eq 'nnir (car (gnus-find-method-for-group group))) + (and group (string-match "^nnir" group)))) + (defun nnir-read-parms (nnir-search-engine) "Reads additional search parameters according to `nnir-engines'." (let ((parmspec (caddr (assoc nnir-search-engine nnir-engines)))) @@ -1754,7 +1760,7 @@ (defun nnir-possibly-change-group (group &optional server) (or (not server) (nnir-server-opened server) (nnir-open-server server)) - (when (and group (string-match "\\`nnir" group)) + (when (gnus-nnir-group-p group) (setq nnir-artlist (gnus-group-get-parameter (gnus-group-prefixed-name (gnus-group-short-name group) '(nnir "nnir")) ------------------------------------------------------------ revno: 112222 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-04-03 20:46:25 -0700 message: ChangeLog fixes 2013-03-16 was not the date Emacs 24.3 was released, it was not even the date on which I merged all changes from that release into trunk. Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00990.html diff: === modified file 'ChangeLog' --- ChangeLog 2013-03-30 17:30:06 +0000 +++ ChangeLog 2013-04-04 03:46:25 +0000 @@ -50,6 +50,10 @@ 2013-03-11 putenv: avoid compilation warning on mingw 2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod. +2013-03-11 Glenn Morris + + * Merge in all changes up to version 24.3 release. + 2013-03-06 Paul Eggert * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872). === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-03-17 22:55:13 +0000 +++ doc/emacs/ChangeLog 2013-04-04 03:46:25 +0000 @@ -13,10 +13,6 @@ * emacs.texi (Top): Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-04 Paul Eggert Prefer UTF-8 for documentation. === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-03-16 22:08:22 +0000 +++ doc/lispintro/ChangeLog 2013-04-04 03:46:25 +0000 @@ -2,10 +2,6 @@ * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-03 Glenn Morris * emacs-lisp-intro.texi (Digression into C): Update example. === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-03-24 17:55:06 +0000 +++ doc/lispref/ChangeLog 2013-04-04 03:46:25 +0000 @@ -16,9 +16,6 @@ * elisp.texi: Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. 2013-03-11 Teodor Zlatanov * control.texi (Pattern matching case statement): Fix typo. === modified file 'leim/ChangeLog' --- leim/ChangeLog 2013-04-02 01:18:40 +0000 +++ leim/ChangeLog 2013-04-04 03:46:25 +0000 @@ -39,10 +39,6 @@ (rules): Use tighter regexps to avoid conflicts. Consolidate the various rules for combining marks. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-02-08 Stefan Monnier * quail/latin-ltx.el: Add greek superscripts. === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2013-04-01 07:58:04 +0000 +++ lib-src/ChangeLog 2013-04-04 03:46:25 +0000 @@ -14,10 +14,6 @@ (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]: Use ERROR_MAX, not ERRMAX. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-13 Paul Eggert File synchronization fixes (Bug#13944). === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-04-04 03:42:10 +0000 +++ lisp/ChangeLog 2013-04-04 03:46:25 +0000 @@ -406,10 +406,6 @@ * thingatpt.el (end-of-sexp): Fix bug#13952. Use syntax-after. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-16 Eli Zaretskii * startup.el (command-line-normalize-file-name): Fix handling of