Mercurial > emacs
view lisp/soundex.el @ 109383:dcdf09a52e2c
[[[
* lisp/bookmark.el (bookmark-bmenu-switch-other-window,
bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override
ambient binding of `bookmark-automatically-show-annotations'. (Bug #6515)
]]]
=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el 2010-04-14 15:07:53 +0000
+++ lisp/bookmark.el 2010-06-27 03:40:14 +0000
@@ -1860,8 +1860,7 @@
(pop-up-windows t))
(delete-other-windows)
(switch-to-buffer (other-buffer))
- (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed?
- (bookmark--jump-via bmrk 'pop-to-buffer))
+ (bookmark--jump-via bmrk 'pop-to-buffer)
(bury-buffer menu)))
@@ -1875,8 +1874,7 @@
"Select this line's bookmark in other window, leaving bookmark menu visible."
(interactive)
(let ((bookmark (bookmark-bmenu-bookmark)))
- (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
- (bookmark--jump-via bookmark 'switch-to-buffer-other-window))))
+ (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))
(defun bookmark-bmenu-switch-other-window ()
@@ -1887,8 +1885,7 @@
(pop-up-windows t)
same-window-buffer-names
same-window-regexps)
- (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
- (bookmark--jump-via bookmark 'display-buffer))))
+ (bookmark--jump-via bookmark 'display-buffer)))
(defun bookmark-bmenu-other-window-with-mouse (event)
"Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."
=== modified file 'lisp/saveplace.el'
--- lisp/saveplace.el 2010-01-13 08:35:10 +0000
+++ lisp/saveplace.el 2010-02-07 23:14:52 +0000
@@ -213,7 +213,7 @@
(symbol-name coding-system-for-write)))
(let ((print-length nil)
(print-level nil))
- (print save-place-alist (current-buffer)))
+ (pp save-place-alist (current-buffer)))
(let ((version-control
(cond
((null save-place-version-control) nil)
author | Karl Fogel <kfogel@red-bean.com> |
---|---|
date | Tue, 13 Jul 2010 18:09:20 -0400 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;;; soundex.el --- implement Soundex algorithm ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Christian Plaunt <chris@bliss.berkeley.edu> ;; Maintainer: FSF ;; Keywords: matching ;; Created: Sat May 15 14:48:18 1993 ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; The Soundex algorithm maps English words into representations of ;; how they sound. Words with vaguely similar sound map to the same string. ;;; Code: (defvar soundex-alist '((?B . "1") (?F . "1") (?P . "1") (?V . "1") (?C . "2") (?G . "2") (?J . "2") (?K . "2") (?Q . "2") (?S . "2") (?X . "2") (?Z . "2") (?D . "3") (?T . "3") (?L . "4") (?M . "5") (?N . "5") (?R . "6")) "Alist of chars-to-key-code for building Soundex keys.") (defun soundex (word) "Return a Soundex key for WORD. Implemented as described in: Knuth, Donald E. \"The Art of Computer Programming, Vol. 3: Sorting and Searching\", Addison-Wesley (1973), pp. 391-392." (let* ((word (upcase word)) (length (length word)) (code (cdr (assq (aref word 0) soundex-alist))) (key (substring word 0 1)) (index 1) (prev-code code)) ;; once we have a four char key, we're done (while (and (> 4 (length key)) (< index length)) ;; look up the code for each letter in word at index (setq code (cdr (assq (aref word index) soundex-alist)) index (1+ index) ;; append code to key unless the same codes belong to ;; adjacent letters in the original string key (concat key (if (or (null code) (string= code prev-code)) () code)) prev-code code)) ;; return a key that is 4 chars long and padded by "0"s if needed (if (> 4 (length key)) (substring (concat key "000") 0 4) key))) ;(defvar soundex-test ; '("Euler" "Gauss" "Hilbert" "Knuth" "Lloyd" "Lukasiewicz" ; "Ellery" "Ghosh" "Heilbronn" "Kant" "Ladd" "Lissajous") ; "\n Knuth's names to demonstrate the Soundex algorithm.") ; ;(mapcar 'soundex soundex-test) ;("E460" "G200" "H416" "K530" "L300" "L222" ; "E460" "G200" "H416" "K530" "L300" "L222") (provide 'soundex) ;; arch-tag: b2615a98-feb7-430e-a717-171086738953 ;;; soundex.el ends here