(gnus-button-mailto): Remove save-selected-window-window hackery

[gnu-emacs] / lisp / locate.el

diff --git a/lisp/locate.el b/lisp/locate.el
index f337bd09bad97752db29a2632fda68849691ee7e..4289d3e975ce9492267c0d3e76ef214a5396a899 100644 (file)
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -154,12 +154,10 @@
 ;;;###autoload
 (defcustom locate-ls-subdir-switches "-al"
   "`ls' switches for inserting subdirectories in `*Locate*' buffers.
-This should contain the \"-l\" switch.
-Use the \"-F\" or \"-b\" switches if and only if you also use
-them for `find-ls-option'."
+This should contain the \"-l\" switch, but not the \"-F\" or \"-b\" switches."
   :type 'string
   :group 'locate
-  :version "21.4")
+  :version "22.1")
 
 (defcustom locate-update-command "updatedb"
   "The command used to update the locate database."
@@ -395,7 +393,7 @@ do not work in subdirectories.
   (make-local-variable 'revert-buffer-function)
   (setq revert-buffer-function 'locate-update)
   (set (make-local-variable 'page-delimiter) "\n\n")
-  (run-hooks 'locate-mode-hook))
+  (run-mode-hooks 'locate-mode-hook))
 
 (defun locate-do-setup (search-string)
   (goto-char (point-min))