HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HideIfDef mode bug fixes and enhancements. This is #2 of 3 patches based
[bpt/emacs.git]
/
lisp
/
mh-e
/
mh-seq.el
diff --git
a/lisp/mh-e/mh-seq.el
b/lisp/mh-e/mh-seq.el
index
6155387
..
d0cd57d
100644
(file)
--- a/
lisp/mh-e/mh-seq.el
+++ b/
lisp/mh-e/mh-seq.el
@@
-1,7
+1,6
@@
;;; mh-seq.el --- MH-E sequences support
;;; mh-seq.el --- MH-E sequences support
-;; Copyright (C) 1993, 1995,
-;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1995, 2001-2014 Free Software Foundation, Inc.
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
;; Author: Bill Wohler <wohler@newt.com>
;; Maintainer: Bill Wohler <wohler@newt.com>
@@
-145,8
+144,7
@@
The list appears in a buffer named \"*MH-E Sequences*\"."
(seq-list mh-seq-list)
(max-len 0))
(with-output-to-temp-buffer temp-buffer
(seq-list mh-seq-list)
(max-len 0))
(with-output-to-temp-buffer temp-buffer
- (save-excursion
- (set-buffer temp-buffer)
+ (with-current-buffer temp-buffer
(erase-buffer)
(message "Listing sequences ...")
(insert "Sequences in folder " folder ":\n")
(erase-buffer)
(message "Listing sequences ...")
(insert "Sequences in folder " folder ":\n")
@@
-200,7
+198,9
@@
MESSAGE appears."
" "))))
;; Shush compiler.
" "))))
;; Shush compiler.
-(defvar tool-bar-mode) ; XEmacs
+(mh-do-in-xemacs
+ (defvar tool-bar-mode))
+(defvar tool-bar-map)
;;;###mh-autoload
(defun mh-narrow-to-seq (sequence)
;;;###mh-autoload
(defun mh-narrow-to-seq (sequence)
@@
-744,9
+744,10
@@
completion is over."
"-norecurse" folder "-sequence" (symbol-name mh-unseen-seq))
(goto-char (point-min))
(multiple-value-bind (folder unseen total)
"-norecurse" folder "-sequence" (symbol-name mh-unseen-seq))
(goto-char (point-min))
(multiple-value-bind (folder unseen total)
- (mh-parse-flist-output-line
- (buffer-substring (point) (mh-line-end-position)))
- (values total unseen folder))))
+ (values-list
+ (mh-parse-flist-output-line
+ (buffer-substring (point) (mh-line-end-position))))
+ (list total unseen folder))))
(defun mh-folder-size-folder (folder)
"Find size of FOLDER using \"folder\"."
(defun mh-folder-size-folder (folder)
"Find size of FOLDER using \"folder\"."
@@
-757,8
+758,8
@@
completion is over."
"-norecurse" folder)
(goto-char (point-min))
(if (re-search-forward " has \\([0-9]+\\) " nil t)
"-norecurse" folder)
(goto-char (point-min))
(if (re-search-forward " has \\([0-9]+\\) " nil t)
- (
values
(string-to-number (match-string 1)) u folder)
- (
values
0 u folder)))))
+ (
list
(string-to-number (match-string 1)) u folder)
+ (
list
0 u folder)))))
;;;###mh-autoload
(defun mh-parse-flist-output-line (line &optional current-folder)
;;;###mh-autoload
(defun mh-parse-flist-output-line (line &optional current-folder)
@@
-786,7
+787,7
@@
folders whose names end with a '+' character."
(when (and (equal (aref folder (1- (length folder))) ?+)
(equal current-folder folder))
(setq folder (substring folder 0 (1- (length folder)))))
(when (and (equal (aref folder (1- (length folder))) ?+)
(equal current-folder folder))
(setq folder (substring folder 0 (1- (length folder)))))
- (
values
(format "+%s" folder) unseen total)))))))
+ (
list
(format "+%s" folder) unseen total)))))))
;;;###mh-autoload
(defun mh-read-folder-sequences (folder save-refiles)
;;;###mh-autoload
(defun mh-read-folder-sequences (folder save-refiles)
@@
-817,7
+818,7
@@
that note messages to be refiled."
"Return a list of message numbers from point to the end of the line.
Expands ranges into set of individual numbers."
(let ((msgs ())
"Return a list of message numbers from point to the end of the line.
Expands ranges into set of individual numbers."
(let ((msgs ())
- (end-of-line (
save-excursion (end-of-line) (point)
))
+ (end-of-line (
point-at-eol
))
num)
(while (re-search-forward "[0-9]+" end-of-line t)
(setq num (string-to-number (buffer-substring (match-beginning 0)
num)
(while (re-search-forward "[0-9]+" end-of-line t)
(setq num (string-to-number (buffer-substring (match-beginning 0)
@@
-1015,5
+1016,4
@@
removed."
;; sentence-end-double-space: nil
;; End:
;; sentence-end-double-space: nil
;; End:
-;; arch-tag: 8e952711-01a2-485b-bf21-c9e3ad4de942
;;; mh-seq.el ends here
;;; mh-seq.el ends here