aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-01-05 17:49:43 +0000
committerDan Nicolaescu2007-01-05 17:49:43 +0000
commitab3aad87d91e8b56d2abc95436b68ab4ad73c332 (patch)
tree77f79a3ce49650ed44289d359e6e0c55b91e87a6
parent9e313cc1222f5a8d9cb520657a9fd94b768bf5f2 (diff)
downloademacs-ab3aad87d91e8b56d2abc95436b68ab4ad73c332.tar.gz
emacs-ab3aad87d91e8b56d2abc95436b68ab4ad73c332.zip
* faces.el (momentary): Move here ...
* subr.el (momentary): ... from here.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/subr.el5
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6169aad14c..378e5388ecb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-01-05 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * faces.el (momentary): Move here ...
4 * subr.el (momentary): ... from here.
5
12007-01-05 Nick Roberts <nickrob@snap.net.nz> 62007-01-05 Nick Roberts <nickrob@snap.net.nz>
2 7
3 * progmodes/gdb-ui.el (gdb-max-children): New customizable variable. 8 * progmodes/gdb-ui.el (gdb-max-children): New customizable variable.
diff --git a/lisp/subr.el b/lisp/subr.el
index 31d220a8dd3..f37f6ffc2e6 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1884,11 +1884,6 @@ menu bar menus and the frame title."
1884 (if all (save-excursion (set-buffer (other-buffer)))) 1884 (if all (save-excursion (set-buffer (other-buffer))))
1885 (set-buffer-modified-p (buffer-modified-p))) 1885 (set-buffer-modified-p (buffer-modified-p)))
1886 1886
1887(defface momentary
1888 '((t (:inherit mode-line)))
1889 "Face for momentarily displaying text in the current buffer."
1890 :group 'display)
1891
1892(defun momentary-string-display (string pos &optional exit-char message) 1887(defun momentary-string-display (string pos &optional exit-char message)
1893 "Momentarily display STRING in the buffer at POS. 1888 "Momentarily display STRING in the buffer at POS.
1894Display remains until next event is input. 1889Display remains until next event is input.