aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Paul Wallington2004-07-25 05:45:53 +0000
committerJohn Paul Wallington2004-07-25 05:45:53 +0000
commita3111ae4d80d4ca060d30ff9ebe6cec1c3e82e03 (patch)
tree262bbd2622d0cef2a588939c7525b41143384dc4
parentf478a72a621f6be3e3abea871adac762f81d34f8 (diff)
downloademacs-a3111ae4d80d4ca060d30ff9ebe6cec1c3e82e03.tar.gz
emacs-a3111ae4d80d4ca060d30ff9ebe6cec1c3e82e03.zip
(butlast, event-modifiers, event-basic-type): Doc fixes.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2b9ee25d96e..65648fbf3cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12004-07-25 John Paul Wallington <jpw@gnu.org>
2
3 * subr.el (butlast, event-modifiers, event-basic-type): Doc fixes.
4
12004-07-24 Luc Teirlinck <teirllm@auburn.edu> 52004-07-24 Luc Teirlinck <teirllm@auburn.edu>
2 6
3 * term/tty-colors.el (tty-color-approximate): Doc fix. 7 * term/tty-colors.el (tty-color-approximate): Doc fix.
diff --git a/lisp/subr.el b/lisp/subr.el
index 9dd1e415212..1e30a127f71 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -198,7 +198,7 @@ If N is bigger than the length of LIST, return LIST."
198 list)) 198 list))
199 199
200(defun butlast (list &optional n) 200(defun butlast (list &optional n)
201 "Returns a copy of LIST with the last N elements removed." 201 "Return a copy of LIST with the last N elements removed."
202 (if (and n (<= n 0)) list 202 (if (and n (<= n 0)) list
203 (nbutlast (copy-sequence list) n))) 203 (nbutlast (copy-sequence list) n)))
204 204
@@ -641,7 +641,7 @@ The normal global definition of the character C-x indirects to this keymap.")
641 (get (car obj) 'event-symbol-elements)))) 641 (get (car obj) 'event-symbol-elements))))
642 642
643(defun event-modifiers (event) 643(defun event-modifiers (event)
644 "Returns a list of symbols representing the modifier keys in event EVENT. 644 "Return a list of symbols representing the modifier keys in event EVENT.
645The elements of the list may include `meta', `control', 645The elements of the list may include `meta', `control',
646`shift', `hyper', `super', `alt', `click', `double', `triple', `drag', 646`shift', `hyper', `super', `alt', `click', `double', `triple', `drag',
647and `down'." 647and `down'."
@@ -670,7 +670,7 @@ and `down'."
670 list)))) 670 list))))
671 671
672(defun event-basic-type (event) 672(defun event-basic-type (event)
673 "Returns the basic type of the given event (all modifiers removed). 673 "Return the basic type of the given event (all modifiers removed).
674The value is a printing character (not upper case) or a symbol." 674The value is a printing character (not upper case) or a symbol."
675 (if (consp event) 675 (if (consp event)
676 (setq event (car event))) 676 (setq event (car event)))