Mercurial > hg > xemacs-beta

comparison lisp/gutter-items.el @ 5885:c8bbb32fe124

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always return a string, #'current-message. lisp/ChangeLog addition: 2015-04-04 Aidan Kehoe <kehoea@parhasard.net> * gutter-items.el (append-progress-feedback): * gutter-items.el (abort-progress-feedback): Correct comments in both these functions, it's the progress stack being adjusted, not the message stack. * simple.el (message-stack): Describe my recent change in the structure of this. * simple.el (current-message): Adjust the implementation of this to always return the string displayed.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 04 Apr 2015 13:49:30 +0100
parents cc6f0266bc36
children
comparison
equal deleted inserted replaced
5884:5a93f519accc 5885:c8bbb32fe124
541 (dispatch-non-command-events) 541 (dispatch-non-command-events)
542 (t nil))) 542 (t nil)))
543 543
544 (defun append-progress-feedback (label message &optional value frame) 544 (defun append-progress-feedback (label message &optional value frame)
545 (or frame (setq frame (selected-frame))) 545 (or frame (setq frame (selected-frame)))
546 ;; Add a new entry to the message-stack, or modify an existing one 546 ;; Add a new entry to the progress-stack, or modify an existing one
547 (let* ((top (car progress-stack)) 547 (let* ((top (car progress-stack))
548 (tmsg (cdr top))) 548 (tmsg (cdr top)))
549 (if (eq label (car top)) 549 (if (eq label (car top))
550 (progn 550 (progn
551 (setcdr top message) 551 (setcdr top message)
566 (defun abort-progress-feedback (label message &optional frame) 566 (defun abort-progress-feedback (label message &optional frame)
567 (if (or (not (valid-image-instantiator-format-p 'progress-gauge frame)) 567 (if (or (not (valid-image-instantiator-format-p 'progress-gauge frame))
568 progress-feedback-use-echo-area) 568 progress-feedback-use-echo-area)
569 (display-message label (concat message "aborted.") frame) 569 (display-message label (concat message "aborted.") frame)
570 (or frame (setq frame (selected-frame))) 570 (or frame (setq frame (selected-frame)))
571 ;; Add a new entry to the message-stack, or modify an existing one 571 ;; Add a new entry to the progress-stack, or modify an existing one
572 (let* ((top (car progress-stack)) 572 (let* ((top (car progress-stack))
573 (inhibit-read-only t)) 573 (inhibit-read-only t))
574 (if (eq label (car top)) 574 (if (eq label (car top))
575 (setcdr top message) 575 (setcdr top message)
576 (push (cons label message) progress-stack)) 576 (push (cons label message) progress-stack))