aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero2010-07-19 12:42:22 +0200
committerJuanma Barranquero2010-07-19 12:42:22 +0200
commit7c7c04c037f2280f01f7e088b6f7b491d0d0f150 (patch)
treed5aa5ef36f4a30aafd6adfeb5f541f4e2164f8a0 /lisp
parente72b6fa4b2323c27af49e790e8f20a33be51559b (diff)
downloademacs-7c7c04c037f2280f01f7e088b6f7b491d0d0f150.tar.gz
emacs-7c7c04c037f2280f01f7e088b6f7b491d0d0f150.zip
* time.el (display-time-day-and-date): Remove spurious * in docstring.
(display-time-world-buffer-name, display-time-world-mode-map): Fix typos in docstrings.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/time.el6
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0dbe931e9f..05f72778b4f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12010-07-19 Juanma Barranquero <lekktu@gmail.com>
2
3 * time.el (display-time-day-and-date): Remove spurious * in docstring.
4 (display-time-world-buffer-name, display-time-world-mode-map):
5 Fix typos in docstrings.
6
12010-07-17 Shyam Karanatt <shyam@swathanthran.in> (tiny change) 72010-07-17 Shyam Karanatt <shyam@swathanthran.in> (tiny change)
2 8
3 * image-mode.el (image-display-size): New function. 9 * image-mode.el (image-display-size): New function.
diff --git a/lisp/time.el b/lisp/time.el
index 5c3456e9c59..302a8c7cd73 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -87,7 +87,7 @@ The value can be one of:
87 87
88;;;###autoload 88;;;###autoload
89(defcustom display-time-day-and-date nil "\ 89(defcustom display-time-day-and-date nil "\
90*Non-nil means \\[display-time] should display day and date as well as time." 90Non-nil means \\[display-time] should display day and date as well as time."
91 :type 'boolean 91 :type 'boolean
92 :group 'display-time) 92 :group 'display-time)
93 93
@@ -182,7 +182,7 @@ LABEL is a string to display as the label of that TIMEZONE's time."
182 :version "23.1") 182 :version "23.1")
183 183
184(defcustom display-time-world-buffer-name "*wclock*" 184(defcustom display-time-world-buffer-name "*wclock*"
185 "Name of the wclock buffer." 185 "Name of the world clock buffer."
186 :group 'display-time 186 :group 'display-time
187 :type 'string 187 :type 'string
188 :version "23.1") 188 :version "23.1")
@@ -203,7 +203,7 @@ LABEL is a string to display as the label of that TIMEZONE's time."
203 (let ((map (make-sparse-keymap))) 203 (let ((map (make-sparse-keymap)))
204 (define-key map "q" 'kill-this-buffer) 204 (define-key map "q" 'kill-this-buffer)
205 map) 205 map)
206 "Keymap of Display Time World mode") 206 "Keymap of Display Time World mode.")
207 207
208;;;###autoload 208;;;###autoload
209(defun display-time () 209(defun display-time ()