From 37a21453db134292b99291226d541df838e7d711 Mon Sep 17 00:00:00 2001 From: Stephen Berman Date: Tue, 22 Jul 2014 23:32:04 +0200 Subject: [PATCH] * calendar/todo-mode.el (todo-set-top-priorities): Fix overwriting of file-wide setting when changing category-wide setting. --- lisp/ChangeLog | 5 +++++ lisp/calendar/todo-mode.el | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c19f7fb665..02189365b4f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-22 Stephen Berman + + * calendar/todo-mode.el (todo-set-top-priorities): Fix overwriting + of file-wide setting when changing category-wide setting. + 2014-07-21 Glenn Morris * progmodes/hideif.el (hide-ifdef-mode-submap): diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index d8bca81ed9b..e5f486a2056 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -4283,24 +4283,25 @@ set the user customizable option `todo-top-priorities-overrides'." (frule (assoc-string file rules)) (crules (nth 2 frule)) (crule (assoc-string cat crules)) - (cur (or (and arg (cdr crule)) - (nth 1 frule) - todo-top-priorities)) + (fcur (or (nth 1 frule) + todo-top-priorities)) + (ccur (or (and arg (cdr crule)) + fcur)) (prompt (if arg (concat "Number of top priorities in this category" " (currently %d): ") (concat "Default number of top priorities per category" " in this file (currently %d): "))) (new -1)) (while (< new 0) - (let ((cur0 cur)) - (setq new (read-number (format prompt cur0)) + (let ((cur (if arg ccur fcur))) + (setq new (read-number (format prompt cur)) prompt "Enter a non-negative number: " - cur0 nil))) + cur nil))) (let ((nrule (if arg (append (delete crule crules) (list (cons cat new))) (append (list file new) (list crules))))) (setq rules (cons (if arg - (list file cur nrule) + (list file fcur nrule) nrule) (delete frule rules))) (customize-save-variable 'todo-top-priorities-overrides rules) -- 2.39.5