aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-08-15 17:51:37 +0000
committerChong Yidong2009-08-15 17:51:37 +0000
commit9d73a99e31ac6f10e1ac019f3daa59196c2d746e (patch)
tree462f22367f097a9a38fa17c6016def83cc88883e
parentf8354c6e36133180444fa1355a445614e7e43011 (diff)
downloademacs-9d73a99e31ac6f10e1ac019f3daa59196c2d746e.tar.gz
emacs-9d73a99e31ac6f10e1ac019f3daa59196c2d746e.zip
* files.el (load-library): Doc fix.
-rw-r--r--lisp/ChangeLog14
-rw-r--r--lisp/files.el10
2 files changed, 15 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0be3871d1f0..6c339b6d4b1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,19 +1,23 @@
12009-08-15 Chong Yidong <cyd@stupidchicken.com>
2
3 * files.el (load-library): Doc fix.
4
12009-08-15 Michael Kifer <kifer@cs.stonybrook.edu> 52009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
2 6
3 * viper-cmd.el (viper-insert-isearch-string): new function. 7 * viper-cmd.el (viper-insert-isearch-string): new function.
4 (viper-if-string): redefine C-s in the minibuffer to insert the last 8 (viper-if-string): redefine C-s in the minibuffer to insert the last
5 incremental search string. 9 incremental search string.
6 10
7 * ediff-init.el (ediff-coding-system): use escape-quoted in case of 11 * ediff-init.el (ediff-coding-system): use escape-quoted in case of
8 XEmacs. 12 XEmacs.
9 13
10 * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip, 14 * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip,
11 ediff-merge-region-is-non-clash, 15 ediff-merge-region-is-non-clash,
12 ediff-skip-merge-region-if-changed-from-default-p): use defun. 16 ediff-skip-merge-region-if-changed-from-default-p): use defun.
13 Also check if the job is really a merge job. 17 Also check if the job is really a merge job.
14 18
15 * ediff.el (ediff-current-file): new function. 19 * ediff.el (ediff-current-file): new function.
16 20
172009-08-15 Chong Yidong <cyd@stupidchicken.com> 212009-08-15 Chong Yidong <cyd@stupidchicken.com>
18 22
19 * progmodes/js.el: Edit docstrings throughout to follow Emacs 23 * progmodes/js.el: Edit docstrings throughout to follow Emacs
diff --git a/lisp/files.el b/lisp/files.el
index 9ca5761bae6..966036a15e4 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -830,10 +830,12 @@ Return nil if COMMAND is not found anywhere in `exec-path'."
830 830
831(defun load-library (library) 831(defun load-library (library)
832 "Load the Emacs Lisp library named LIBRARY. 832 "Load the Emacs Lisp library named LIBRARY.
833This is one of two interfaces (the other being `load-file') to the underlying 833This is an interface to the function `load'. LIBRARY is searched
834function `load'. The library actually loaded is searched for in `load-path' 834for in `load-path', both with and without `load-suffixes' (as
835with or without the `load-suffixes' (as well as `load-file-rep-suffixes'). 835well as `load-file-rep-suffixes').
836See Info node `(emacs)Lisp Libraries' for more details." 836
837See Info node `(emacs)Lisp Libraries' for more details.
838See `load-file' for a different interface to `load'."
837 (interactive 839 (interactive
838 (list (completing-read "Load library: " 840 (list (completing-read "Load library: "
839 (apply-partially 'locate-file-completion-table 841 (apply-partially 'locate-file-completion-table