aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/filesets.el
diff options
context:
space:
mode:
authorKaroly Lorentey2004-11-13 18:34:40 +0000
committerKaroly Lorentey2004-11-13 18:34:40 +0000
commite417405015c93c81641f5c4a33ec898b5c353772 (patch)
tree017a980c35c8a71c372304418d151e3826f88636 /lisp/filesets.el
parentf590a2a442d19f3a74d7bbd02bbcb4e3239f2327 (diff)
parent68d1b30d251b4771f739d20f507cd9523ae3919b (diff)
downloademacs-e417405015c93c81641f5c4a33ec898b5c353772.tar.gz
emacs-e417405015c93c81641f5c4a33ec898b5c353772.zip
Merged in changes from CVS trunk.
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-673 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-674 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-675 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-676 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-677 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-681 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-682 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-683 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-684 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-685 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-686 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-687 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-693 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267
Diffstat (limited to 'lisp/filesets.el')
-rw-r--r--lisp/filesets.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 74a2a72bb34..8599cb01d93 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1356,7 +1356,7 @@ Use the viewer defined in EV-ENTRY (a valid element of
1356 (run-hooks 'oh)) 1356 (run-hooks 'oh))
1357 (set-buffer-modified-p nil) 1357 (set-buffer-modified-p nil)
1358 (setq buffer-read-only t) 1358 (setq buffer-read-only t)
1359 (beginning-of-buffer)) 1359 (goto-char (point-min)))
1360 (when oh 1360 (when oh
1361 (run-hooks 'oh)))) 1361 (run-hooks 'oh))))
1362 (filesets-error 'error 1362 (filesets-error 'error
@@ -1593,7 +1593,8 @@ SAVE-FUNCTION takes no argument, but works on the current buffer."
1593(defun filesets-cmd-show-result (cmd output) 1593(defun filesets-cmd-show-result (cmd output)
1594 "Show OUTPUT of CMD (a shell command)." 1594 "Show OUTPUT of CMD (a shell command)."
1595 (pop-to-buffer "*Filesets: Shell Command Output*") 1595 (pop-to-buffer "*Filesets: Shell Command Output*")
1596 (end-of-buffer) 1596 (with-no-warnings
1597 (end-of-buffer))
1597 (insert "*** ") 1598 (insert "*** ")
1598 (insert cmd) 1599 (insert cmd)
1599 (newline) 1600 (newline)
@@ -1638,7 +1639,7 @@ Replace <file-name> or <<file-name>> with filename."
1638 (save-restriction 1639 (save-restriction
1639 (let ((buffer (filesets-find-file this))) 1640 (let ((buffer (filesets-find-file this)))
1640 (when buffer 1641 (when buffer
1641 (beginning-of-buffer) 1642 (goto-char (point-min))
1642 (let () 1643 (let ()
1643 (cond 1644 (cond
1644 ((stringp fn) 1645 ((stringp fn)