aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2014-12-15 15:09:04 -0500
committerStefan Monnier2014-12-15 15:09:04 -0500
commitfb420e7789b4f9a0481ee44dbdf37d3de6578ad3 (patch)
treeb4858f3b4a55d9acd2b886e1decfb7f049b6fd0b /lisp
parent061db139896a6eabebef5bfe199744b6151493f3 (diff)
downloademacs-fb420e7789b4f9a0481ee44dbdf37d3de6578ad3.tar.gz
emacs-fb420e7789b4f9a0481ee44dbdf37d3de6578ad3.zip
* lisp/subr.el (sit-for): Tweak docstring.
Fixes: debbugs:19381 * src/buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring. * build-aux/git-hooks/commit-msg (at_sign): Bump up line-length limit to 78.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog36
-rw-r--r--lisp/subr.el4
2 files changed, 22 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6bf86809c2..9e242ca99fa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-12-15 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * subr.el (sit-for): Tweak docstring (bug#19381).
4
12014-12-15 Dmitry Gutov <dgutov@yandex.ru> 52014-12-15 Dmitry Gutov <dgutov@yandex.ru>
2 6
3 * vc/vc-git.el (vc-git-after-dir-status-stage): Move `up-to-date' 7 * vc/vc-git.el (vc-git-after-dir-status-stage): Move `up-to-date'
@@ -20,8 +24,8 @@
20 24
212014-12-09 Fabián Ezequiel Gallina <fgallina@gnu.org> 252014-12-09 Fabián Ezequiel Gallina <fgallina@gnu.org>
22 26
23 * progmodes/python.el (python-shell-parse-command): Quote 27 * progmodes/python.el (python-shell-parse-command):
24 `python-shell-interpreter`. (Bug#19289) 28 Quote `python-shell-interpreter`. (Bug#19289)
25 29
262014-12-04 Stefan Monnier <monnier@iro.umontreal.ca> 302014-12-04 Stefan Monnier <monnier@iro.umontreal.ca>
27 31
@@ -60,8 +64,8 @@
60 64
612014-11-27 Fabián Ezequiel Gallina <fgallina@gnu.org> 652014-11-27 Fabián Ezequiel Gallina <fgallina@gnu.org>
62 66
63 * progmodes/python.el (python-shell-completion-setup-code): Use 67 * progmodes/python.el (python-shell-completion-setup-code):
64 __builtin__ module (or builtins in Python 3) and catch all errors 68 Use __builtin__ module (or builtins in Python 3) and catch all errors
65 when importing readline and rlcompleter. 69 when importing readline and rlcompleter.
66 70
672014-11-26 Stephen Berman <stephen.berman@gmx.net> 712014-11-26 Stephen Berman <stephen.berman@gmx.net>
@@ -113,8 +117,8 @@
113 117
1142014-11-21 Eli Zaretskii <eliz@gnu.org> 1182014-11-21 Eli Zaretskii <eliz@gnu.org>
115 119
116 * vc/vc-git.el (vc-git-command, vc-git--call): Bind 120 * vc/vc-git.el (vc-git-command, vc-git--call):
117 coding-system-for-read and coding-system-for-write to 121 Bind coding-system-for-read and coding-system-for-write to
118 vc-git-commits-coding-system. 122 vc-git-commits-coding-system.
119 (vc-git-previous-revision): Use "~1" instead of "^", since the 123 (vc-git-previous-revision): Use "~1" instead of "^", since the
120 latter is a special character for MS-Windows system shells. 124 latter is a special character for MS-Windows system shells.
@@ -155,8 +159,8 @@
155 159
1562014-11-16 Fabián Ezequiel Gallina <fgallina@gnu.org> 1602014-11-16 Fabián Ezequiel Gallina <fgallina@gnu.org>
157 161
158 * progmodes/python.el (python-eldoc--get-doc-at-point): Strip 162 * progmodes/python.el (python-eldoc--get-doc-at-point):
159 shell output before returning. (bug#18794) 163 Strip shell output before returning. (bug#18794)
160 164
1612014-11-16 Dmitry Gutov <dgutov@yandex.ru> 1652014-11-16 Dmitry Gutov <dgutov@yandex.ru>
162 166
@@ -177,13 +181,13 @@
177 181
1782014-11-15 Fabián Ezequiel Gallina <fgallina@gnu.org> 1822014-11-15 Fabián Ezequiel Gallina <fgallina@gnu.org>
179 183
180 * progmodes/python.el (python-indent-calculate-levels): Fix 184 * progmodes/python.el (python-indent-calculate-levels):
181 indentation behavior multiline dedenter statement. (Bug#18432) 185 Fix indentation behavior multiline dedenter statement. (Bug#18432)
182 186
1832014-11-15 Fabián Ezequiel Gallina <fgallina@gnu.org> 1872014-11-15 Fabián Ezequiel Gallina <fgallina@gnu.org>
184 188
185 * progmodes/python.el (python-indent-region): Use 189 * progmodes/python.el (python-indent-region):
186 python-indent-line and skip special cases. (Bug#18843) 190 Use python-indent-line and skip special cases. (Bug#18843)
187 191
1882014-11-15 Michael Albinus <michael.albinus@gmx.de> 1922014-11-15 Michael Albinus <michael.albinus@gmx.de>
189 193
@@ -196,8 +200,8 @@
196 200
1972014-11-14 Ivan Andrus <darthandrus@gmail.com> 2012014-11-14 Ivan Andrus <darthandrus@gmail.com>
198 202
199 * progmodes/python.el (python-ffap-module-path): Use 203 * progmodes/python.el (python-ffap-module-path):
200 `derived-mode-p' instead of equality test on `major-mode'. 204 Use `derived-mode-p' instead of equality test on `major-mode'.
201 205
2022014-11-13 Ulrich Müller <ulm@gentoo.org> 2062014-11-13 Ulrich Müller <ulm@gentoo.org>
203 207
@@ -247,8 +251,8 @@
2472014-11-05 Alan Mackenzie <acm@muc.de> 2512014-11-05 Alan Mackenzie <acm@muc.de>
248 252
249 Fix wrong bound to c-font-lock-declarators. Fixes bug #18948. 253 Fix wrong bound to c-font-lock-declarators. Fixes bug #18948.
250 * progmodes/cc-fonts.el (c-font-lock-declarations): Pass 254 * progmodes/cc-fonts.el (c-font-lock-declarations):
251 "(point-max)" as bound to c-font-lock-declarators, not "limit", as 255 Pass "(point-max)" as bound to c-font-lock-declarators, not "limit", as
252 the buffer is sometimes narrowed to less than "limit" (e.g., in 256 the buffer is sometimes narrowed to less than "limit" (e.g., in
253 the presence of macros). 257 the presence of macros).
254 258
diff --git a/lisp/subr.el b/lisp/subr.el
index 215699de178..839b9159519 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2142,7 +2142,7 @@ keyboard-quit events while waiting for a valid input."
2142 char)) 2142 char))
2143 2143
2144(defun sit-for (seconds &optional nodisp obsolete) 2144(defun sit-for (seconds &optional nodisp obsolete)
2145 "Perform redisplay, then wait for SECONDS seconds or until input is available. 2145 "Redisplay, then wait for SECONDS seconds. Stop when input is available.
2146SECONDS may be a floating-point value. 2146SECONDS may be a floating-point value.
2147\(On operating systems that do not support waiting for fractions of a 2147\(On operating systems that do not support waiting for fractions of a
2148second, floating-point values are rounded down to the nearest integer.) 2148second, floating-point values are rounded down to the nearest integer.)
@@ -2160,7 +2160,7 @@ floating point support."
2160 (declare (advertised-calling-convention (seconds &optional nodisp) "22.1")) 2160 (declare (advertised-calling-convention (seconds &optional nodisp) "22.1"))
2161 ;; This used to be implemented in C until the following discussion: 2161 ;; This used to be implemented in C until the following discussion:
2162 ;; http://lists.gnu.org/archive/html/emacs-devel/2006-07/msg00401.html 2162 ;; http://lists.gnu.org/archive/html/emacs-devel/2006-07/msg00401.html
2163 ;; Then it was moved to C using an implementation based on an idle timer, 2163 ;; Then it was moved here using an implementation based on an idle timer,
2164 ;; which was then replaced by the use of read-event. 2164 ;; which was then replaced by the use of read-event.
2165 (if (numberp nodisp) 2165 (if (numberp nodisp)
2166 (setq seconds (+ seconds (* 1e-3 nodisp)) 2166 (setq seconds (+ seconds (* 1e-3 nodisp))