aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-08-14 08:58:46 -0700
committerGlenn Morris2012-08-14 08:58:46 -0700
commit3c3cda1a7364b3855ce458834d5fccbcfbb3c495 (patch)
treee65d40580d27f50f500c9aa258c3612f9440f88d
parent89534796c8f02c6d1c7a84a0d766bfecdcf11c4f (diff)
downloademacs-3c3cda1a7364b3855ce458834d5fccbcfbb3c495.tar.gz
emacs-3c3cda1a7364b3855ce458834d5fccbcfbb3c495.zip
* lisp/emacs-lisp/bytecomp.el (byte-recompile-file): Doc fix.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/emacs-lisp/bytecomp.el23
2 files changed, 16 insertions, 14 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bd96d09aad..454b8ed38ea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-08-14 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/bytecomp.el (byte-recompile-file): Doc fix.
4
12012-08-14 Michael Albinus <michael.albinus@gmx.de> 52012-08-14 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * net/tramp-sh.el (tramp-open-shell): Cache the shell name. 7 * net/tramp-sh.el (tramp-open-shell): Cache the shell name.
@@ -7,8 +11,7 @@
72012-08-14 Fabián Ezequiel Gallina <fgallina@cuca> 112012-08-14 Fabián Ezequiel Gallina <fgallina@cuca>
8 12
9 * progmodes/python.el (python-shell-send-string): 13 * progmodes/python.el (python-shell-send-string):
10 (python-shell-send-setup-code): Do not use `format' with 14 (python-shell-send-setup-code): Do not use `format' with `message'.
11 `message'.
12 15
132012-08-14 Dmitry Gutov <dgutov@yandex.ru> 162012-08-14 Dmitry Gutov <dgutov@yandex.ru>
14 17
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 1e0ab336f41..abfd73cb438 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1621,21 +1621,20 @@ This is normally set in local file variables at the end of the elisp file:
1621 "Recompile FILENAME file if it needs recompilation. 1621 "Recompile FILENAME file if it needs recompilation.
1622This happens when its `.elc' file is older than itself. 1622This happens when its `.elc' file is older than itself.
1623 1623
1624If the `.elc' file exists and is up-to-date, normally this 1624If the `.elc' file exists and is up-to-date, normally this function
1625function *does not* compile FILENAME. However, if the 1625*does not* compile FILENAME. If the prefix argument FORCE is non-nil,
1626prefix argument FORCE is set, that means do compile 1626however, it compiles FILENAME even if the destination already
1627FILENAME even if the destination already exists and is 1627exists and is up-to-date.
1628up-to-date.
1629 1628
1630If the `.elc' file does not exist, normally this function *does 1629If the `.elc' file does not exist, normally this function *does not*
1631not* compile FILENAME. If ARG is 0, that means 1630compile FILENAME. If optional argument ARG is 0, it compiles
1632compile the file even if it has never been compiled before. 1631the input file even if the `.elc' file does not exist.
1633A nonzero ARG means ask the user. 1632Any other non-nil value of ARG means to ask the user.
1634 1633
1635If LOAD is non-nil, `load' the file after compiling. 1634If optional argument LOAD is non-nil, loads the file after compiling.
1636 1635
1637The value returned is the value returned by `byte-compile-file', 1636If compilation is needed, this functions returns the result of
1638or 'no-byte-compile if the file did not need recompilation." 1637`byte-compile-file'; otherwise it returns 'no-byte-compile."
1639 (interactive 1638 (interactive
1640 (let ((file buffer-file-name) 1639 (let ((file buffer-file-name)
1641 (file-name nil) 1640 (file-name nil)