diff options
| -rw-r--r-- | lisp/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/files.el | 10 |
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 @@ +2009-08-15 Chong Yidong <cyd@stupidchicken.com> + + * files.el (load-library): Doc fix. + 2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu> - + * viper-cmd.el (viper-insert-isearch-string): new function. (viper-if-string): redefine C-s in the minibuffer to insert the last incremental search string. - + * ediff-init.el (ediff-coding-system): use escape-quoted in case of XEmacs. - + * ediff-merg.el (ediff-merge-region-is-non-clash-to-skip, ediff-merge-region-is-non-clash, ediff-skip-merge-region-if-changed-from-default-p): use defun. Also check if the job is really a merge job. - + * ediff.el (ediff-current-file): new function. - + 2009-08-15 Chong Yidong <cyd@stupidchicken.com> * 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'." (defun load-library (library) "Load the Emacs Lisp library named LIBRARY. -This is one of two interfaces (the other being `load-file') to the underlying -function `load'. The library actually loaded is searched for in `load-path' -with or without the `load-suffixes' (as well as `load-file-rep-suffixes'). -See Info node `(emacs)Lisp Libraries' for more details." +This is an interface to the function `load'. LIBRARY is searched +for in `load-path', both with and without `load-suffixes' (as +well as `load-file-rep-suffixes'). + +See Info node `(emacs)Lisp Libraries' for more details. +See `load-file' for a different interface to `load'." (interactive (list (completing-read "Load library: " (apply-partially 'locate-file-completion-table |