Mercurial > emacs
annotate lisp/soundex.el @ 83167:69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 04 Jul 2004 04:48:55 +0000 |
parents | 695cf19ef79e |
children | 6fb026ad601f 375f2633d815 |
rev | line source |
---|---|
15261 | 1 ;;; soundex.el --- implement Soundex algorithm |
5995 | 2 |
3 ;; Copyright (C) 1993 Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Christian Plaunt <chris@bliss.berkeley.edu> | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
38412
diff
changeset
|
6 ;; Maintainer: FSF |
5995 | 7 ;; Keywords: matching |
8 ;; Created: Sat May 15 14:48:18 1993 | |
9 | |
10 ;; This file is part of GNU Emacs. | |
11 | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
5995 | 26 |
27 ;;; Commentary: | |
28 | |
29 ;; The Soundex algorithm maps English words into representations of | |
30 ;; how they sound. Words with vaguely similar sound map to the same string. | |
31 | |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
18383
diff
changeset
|
32 ;;; Code: |
5995 | 33 |
7534
9b82dae27c01
(soundex-alist): Put variable before fn that uses it.
Richard M. Stallman <rms@gnu.org>
parents:
5995
diff
changeset
|
34 (defvar soundex-alist |
8028
ba1bbdb8595e
(soundex-alist): Delete the elements that mapped into nil.
Richard M. Stallman <rms@gnu.org>
parents:
7534
diff
changeset
|
35 '((?B . "1") (?F . "1") (?P . "1") (?V . "1") |
7534
9b82dae27c01
(soundex-alist): Put variable before fn that uses it.
Richard M. Stallman <rms@gnu.org>
parents:
5995
diff
changeset
|
36 (?C . "2") (?G . "2") (?J . "2") (?K . "2") (?Q . "2") (?S . "2") |
9b82dae27c01
(soundex-alist): Put variable before fn that uses it.
Richard M. Stallman <rms@gnu.org>
parents:
5995
diff
changeset
|
37 (?X . "2") (?Z . "2") (?D . "3") (?T . "3") (?L . "4") (?M . "5") |
9b82dae27c01
(soundex-alist): Put variable before fn that uses it.
Richard M. Stallman <rms@gnu.org>
parents:
5995
diff
changeset
|
38 (?N . "5") (?R . "6")) |
9b82dae27c01
(soundex-alist): Put variable before fn that uses it.
Richard M. Stallman <rms@gnu.org>
parents:
5995
diff
changeset
|
39 "Alist of chars-to-key-code for building Soundex keys.") |
9b82dae27c01
(soundex-alist): Put variable before fn that uses it.
Richard M. Stallman <rms@gnu.org>
parents:
5995
diff
changeset
|
40 |
5995 | 41 (defun soundex (word) |
42 "Return a Soundex key for WORD. | |
43 Implemented as described in: | |
44 Knuth, Donald E. \"The Art of Computer Programming, Vol. 3: Sorting | |
45 and Searching\", Addison-Wesley (1973), pp. 391-392." | |
46 (let* ((word (upcase word)) (length (length word)) | |
47 (code (cdr (assq (aref word 0) soundex-alist))) | |
48 (key (substring word 0 1)) (index 1) (prev-code code)) | |
8028
ba1bbdb8595e
(soundex-alist): Delete the elements that mapped into nil.
Richard M. Stallman <rms@gnu.org>
parents:
7534
diff
changeset
|
49 ;; once we have a four char key, we're done |
5995 | 50 (while (and (> 4 (length key)) (< index length)) |
51 ;; look up the code for each letter in word at index | |
52 (setq code (cdr (assq (aref word index) soundex-alist)) | |
53 index (1+ index) | |
54 ;; append code to key unless the same codes belong to | |
55 ;; adjacent letters in the original string | |
56 key (concat key (if (or (null code) (string= code prev-code)) | |
57 () | |
58 code)) | |
59 prev-code code)) | |
60 ;; return a key that is 4 chars long and padded by "0"s if needed | |
61 (if (> 4 (length key)) | |
62 (substring (concat key "000") 0 4) | |
63 key))) | |
64 | |
65 ;(defvar soundex-test | |
66 ; '("Euler" "Gauss" "Hilbert" "Knuth" "Lloyd" "Lukasiewicz" | |
67 ; "Ellery" "Ghosh" "Heilbronn" "Kant" "Ladd" "Lissajous") | |
68 ; "\n Knuth's names to demonstrate the Soundex algorithm.") | |
69 ; | |
70 ;(mapcar 'soundex soundex-test) | |
71 ;("E460" "G200" "H416" "K530" "L300" "L222" | |
72 ; "E460" "G200" "H416" "K530" "L300" "L222") | |
73 | |
18383 | 74 (provide 'soundex) |
75 | |
52401 | 76 ;;; arch-tag: b2615a98-feb7-430e-a717-171086738953 |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
18383
diff
changeset
|
77 ;;; soundex.el ends here |