Author: mattiase
Date: Thu Nov 19 20:08:45 2009
New Revision: 882272
URL: http://svn.apache.org/viewvc?rev=882272&view=rev
Log:
Display the svn-status help in the message area instead of creating a new
buffer and window. This is better because it goes away automatically.
(Change suggested by Jonathan Kotta.)
* contrib/client-side/emacs/dsvn.el:
(svn-status-help): Use the message area instead of a buffer.
Modified:
subversion/trunk/contrib/client-side/emacs/dsvn.el
Modified: subversion/trunk/contrib/client-side/emacs/dsvn.el
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/emacs/dsvn.el?rev=882272&r1=882271&r2=882272&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/trunk/contrib/client-side/emacs/dsvn.el Thu Nov 19 20:08:45 2009
@@ -2012,51 +2012,36 @@
"\n"))
(defun svn-status-help ()
- "Display keyboard help for svn status buffer."
+ "Display keyboard help for the svn-status buffer."
(interactive)
- (let* ((buf (get-buffer-create "*svn-keyboard-help*"))
- (help-text
- (svn-merge-columns
- (list (svn-format-help-column
- '((svn-commit "commit marked files")
- (svn-add-file "add marked files")
- (svn-remove-file "remove marked files")
- (svn-revert "revert marked files")
- (svn-update-current "update working copy")
- (svn-resolve "resolve conflicts")
- (svn-move "rename/move files")
- (svn-switch "switch working tree")
- (svn-merge "merge into WC")
- (svn-propedit "edit properties")))
- (svn-format-help-column
- '((svn-mark-forward "mark and go down")
- (svn-unmark-backward "go up and unmark")
- (svn-unmark-forward "unmark and go down")
- (svn-toggle-mark "toggle mark")
- (svn-unmark-all "unmark all")))
- (svn-format-help-column
- '((svn-find-file "visit file")
- (svn-find-file-other-window "visit file other win")
- (svn-diff-file "show file diff")
- (svn-file-log "show file log")
- (svn-refresh "refresh all files")
- (svn-refresh-file "refresh marked files")
- (svn-refresh-one "refresh named file")
- (svn-expunge "expunge unchanged"))))
- 24)))
- (with-current-buffer buf
- (setq buffer-read-only t)
- (let ((inhibit-read-only t))
- (erase-buffer)
- (insert help-text)
- (goto-char 1))
- (set-buffer-modified-p nil))
- (unless (get-buffer-window buf)
- (let ((nlines (with-current-buffer buf
- (count-lines 1 (buffer-size)))))
- (set-window-buffer
- (split-window-vertically (- 0 nlines 1))
- buf)))))
+ (message (svn-merge-columns
+ (list (svn-format-help-column
+ '((svn-commit "commit marked files")
+ (svn-add-file "add marked files")
+ (svn-remove-file "remove marked files")
+ (svn-revert "revert marked files")
+ (svn-update-current "update working copy")
+ (svn-resolve "resolve conflicts")
+ (svn-move "rename/move files")
+ (svn-switch "switch working tree")
+ (svn-merge "merge into WC")
+ (svn-propedit "edit properties")))
+ (svn-format-help-column
+ '((svn-mark-forward "mark and go down")
+ (svn-unmark-backward "go up and unmark")
+ (svn-unmark-forward "unmark and go down")
+ (svn-toggle-mark "toggle mark")
+ (svn-unmark-all "unmark all")))
+ (svn-format-help-column
+ '((svn-find-file "visit file")
+ (svn-find-file-other-window "visit file other win")
+ (svn-diff-file "show file diff")
+ (svn-file-log "show file log")
+ (svn-refresh "refresh all files")
+ (svn-refresh-file "refresh marked files")
+ (svn-refresh-one "refresh named file")
+ (svn-expunge "expunge unchanged"))))
+ 24)))
;;; Hooks
