annotate lisp/misc.el @ 94938:5752d7154afc

Throughout the file, delete all USE_FONT_BACKEND conditionals. Don't check enable_font_backend. Delete all codes used only when USE_FONT_BACKEND is not defined. Use FONT_XXX_NAME_NUMERIC instead of face_numeric_xxx. (QCfoundry, QCadstyle, QCregistry, QCspacing, QCsize, QCavgwidth) (Qp): Extern them. (clear_font_table, load_face_font, xlfd_lookup_field_contents): Deleted. (struct font_name): Deleted. (xlfd_numeric_value, xlfd_symbolic_value): Deleted. (compare_fonts_by_sort_order): New function. (xlfd_numeric_slant, xlfd_symbolic_slant, xlfd_numeric_weight) (xlfd_symbolic_weight, xlfd_numeric_swidth, xlfd_symbolic_swidth): Deleted. (Fx_family_fonts): Use font_list_entities, and sort fonts by compare_fonts_by_sort_order. (Fx_font_family_list): Call Ffont_family_list. (face_numeric_value, face_numeric_weight, face_numeric_slant) (face_numeric_swidth, face_symbolic_value, face_symbolic_weight) (face_symbolic_slant, face_symbolic_swidth) (split_font_name_into_vector, build_font_name_from_vector) (xlfd_fixed_p, xlfd_point_size, pixel_point_size) (font_rescale_ratio, split_font_name, build_font_name) (free_font_names, sort_fonts, x_face_list_fonts) (face_font_available_p, sorted_font_list, cmp_font_names) (font_list_1, concat_font_list, font_list, remove_duplicates): Deleted. (Fx_list_fonts): Use Ffont_list. (LFACE_AVGWIDTH): Deleted. (check_lface_attrs): Don't check LFACE_AVGWIDTH. Check LFACE_FONT by FONTP. (lface_fully_specified_p): Don't check LFACE_AVGWIDTH. (set_lface_from_font_name): Delete it. (set_lface_from_font): Renamed from set_lface_from_font_and_fontset. Caller changed. Don't set LFACE_AVGWIDTH. Use FONT_XXX_FOR_FACE to get a symbol suitable for face. (merge_face_vectors): Copy font-spec if necessary. Clear properties of the font-spec if necessary. (merge_face_ref): Clear properties of the font-spec if necessary. (Finternal_set_lisp_face_attribute): Likewise. (set_font_frame_param): Use font_load_for_lface to load a font-object, and call Fmodify_frame_parameters with it. (x_update_menu_appearance): Don't check LFACE_AVGWIDTH. Get XLFD font name by Ffont_xlfd_name. (Finternal_lisp_face_attribute_values): Don't check QCweight, QCslant, and QCwidth. (Fface_font): Get a font name from font->props[FONT_NAME_INDEX]. (lface_same_font_attributes_p): Don't check LFACE_AVGWIDTH. Compare fonts by EQ. (lookup_non_ascii_face): Deleted. (face_for_font): The 2nd argument changed. (x_supports_face_attributes_p): Don't check LFACE_AVGWIDTH. Check atomic font properties by case insensitive. (realize_non_ascii_face): Set face->overstrike correctly. (realize_x_face): Likewise. Check if LFACE_FONT is a font_object. (dump_realized_face): Get font name from font->props[FONT_NAME_INDEX]. Don't print font_info_id.
author Kenichi Handa <handa@m17n.org>
date Wed, 14 May 2008 01:41:52 +0000
parents ee5932bf781d
children dd817152aca5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1 ;;; misc.el --- some nonstandard basic editing commands for Emacs
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 35
diff changeset
2
74442
b2e5081b9320 Update copyright years.
Glenn Morris <rgm@gnu.org>
parents: 74260
diff changeset
3 ;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
79721
73661ddc7ac7 Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
4 ;; 2006, 2007, 2008 Free Software Foundation, Inc.
845
213978acbc1e entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
5
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 659
diff changeset
6 ;; Maintainer: FSF
45078
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38412
diff changeset
7 ;; Keywords: convenience
35
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
35
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; (at your option) any later version.
35
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 ;; GNU General Public License for more details.
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
35
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23
38412
253f761ad37b Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents: 18383
diff changeset
24 ;;; Commentary:
253f761ad37b Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents: 18383
diff changeset
25
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 659
diff changeset
26 ;;; Code:
35
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 (defun copy-from-above-command (&optional arg)
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
29 "Copy characters from previous nonblank line, starting just above point.
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
30 Copy ARG characters, but not past the end of that line.
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
31 If no argument given, copy the entire rest of the line.
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32 The characters copied are inserted in the buffer before point."
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 (interactive "P")
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
34 (let ((cc (current-column))
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 n
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36 (string ""))
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37 (save-excursion
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38 (beginning-of-line)
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39 (backward-char 1)
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 (skip-chars-backward "\ \t\n")
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41 (move-to-column cc)
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 ;; Default is enough to copy the whole rest of the line.
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 (setq n (if arg (prefix-numeric-value arg) (point-max)))
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 ;; If current column winds up in middle of a tab,
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 ;; copy appropriate number of "virtual" space chars.
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
46 (if (< cc (current-column))
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
47 (if (= (preceding-char) ?\t)
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48 (progn
74237
8dbfc40e9ab8 (copy-from-above-command): "?\ " -> "?\s".
Juanma Barranquero <lekktu@gmail.com>
parents: 68651
diff changeset
49 (setq string (make-string (min n (- (current-column) cc)) ?\s))
35
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50 (setq n (- n (min n (- (current-column) cc)))))
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
51 ;; In middle of ctl char => copy that whole char.
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
52 (backward-char 1)))
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
53 (setq string (concat string
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
54 (buffer-substring
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55 (point)
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
56 (min (save-excursion (end-of-line) (point))
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
57 (+ n (point)))))))
63b375f17a65 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
58 (insert string)))
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 35
diff changeset
59
52600
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
60 ;; Variation of `zap-to-char'.
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
61
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
62 (defun zap-up-to-char (arg char)
74260
b55f65338d33 (zap-up-to-char): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 74237
diff changeset
63 "Kill up to, but not including ARGth occurrence of CHAR.
52600
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
64 Case is ignored if `case-fold-search' is non-nil in the current buffer.
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
65 Goes backward if ARG is negative; error if CHAR not found.
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
66 Ignores CHAR at point."
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
67 (interactive "p\ncZap up to char: ")
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
68 (let ((direction (if (>= arg 0) 1 -1)))
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
69 (kill-region (point)
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
70 (progn
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
71 (forward-char direction)
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
72 (unwind-protect
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
73 (search-forward (char-to-string char) nil nil arg)
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
74 (backward-char direction))
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
75 (point)))))
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
76
51340
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
77 ;; These were added with an eye to making possible a more CCA-compatible
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
78 ;; command set; but that turned out not to be interesting.
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
79
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
80 (defun mark-beginning-of-buffer ()
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
81 "Set mark at the beginning of the buffer."
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
82 (interactive)
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
83 (push-mark (point-min)))
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
84
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
85 (defun mark-end-of-buffer ()
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
86 "Set mark at the end of the buffer."
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
87 (interactive)
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
88 (push-mark (point-max)))
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
89
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
90 (defun upcase-char (arg)
52600
7a4a7a399a2f (upcase-char): Fix docstring.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
91 "Uppercasify ARG chars starting from point. Point doesn't move."
51340
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
92 (interactive "p")
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
93 (save-excursion
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
94 (upcase-region (point) (progn (forward-char arg) (point)))))
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
95
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
96 (defun forward-to-word (arg)
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
97 "Move forward until encountering the beginning of a word.
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
98 With argument, do this that many times."
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
99 (interactive "p")
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
100 (or (re-search-forward (if (> arg 0) "\\W\\b" "\\b\\W") nil t arg)
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
101 (goto-char (if (> arg 0) (point-max) (point-min)))))
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
102
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
103 (defun backward-to-word (arg)
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
104 "Move backward until encountering the end of a word.
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
105 With argument, do this that many times."
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
106 (interactive "p")
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
107 (forward-to-word (- arg)))
bd66b46adcc8 (mark-beginning-of-buffer, mark-end-of-buffer, upcase-char, forward-to-word,
Juanma Barranquero <lekktu@gmail.com>
parents: 45078
diff changeset
108
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
109 (provide 'misc)
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
110
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79721
diff changeset
111 ;; arch-tag: 908f7884-c19e-4388-920c-9cfa425e449b
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 35
diff changeset
112 ;;; misc.el ends here