aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/composite.el
diff options
context:
space:
mode:
authorJuanma Barranquero2013-06-21 14:24:37 +0200
committerJuanma Barranquero2013-06-21 14:24:37 +0200
commitcedf5c9dbe66fecc37979e133f06d8bf4db3814f (patch)
tree1a71f618d4f6125582ace064c8eadf4fafb8bb15 /lisp/composite.el
parent4628c0bf57a62949c617dc28777b5afe21d1ca78 (diff)
downloademacs-cedf5c9dbe66fecc37979e133f06d8bf4db3814f.tar.gz
emacs-cedf5c9dbe66fecc37979e133f06d8bf4db3814f.zip
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local.
* lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
Diffstat (limited to 'lisp/composite.el')
-rw-r--r--lisp/composite.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/composite.el b/lisp/composite.el
index 4832848cb90..3c25b8b60af 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -57,8 +57,8 @@ The meaning of glyph reference point codes is as follows:
57 | | 7:bc or bottom-center 57 | | 7:bc or bottom-center
58 6----7----8 <---- descent 8:br or bottom-right 58 6----7----8 <---- descent 8:br or bottom-right
59 59
60Glyph reference point symbols are to be used to specify composition 60Glyph reference point symbols are to be used to specify a composition
61rule of the form \(GLOBAL-REF-POINT . NEW-REF-POINT), where 61rule of the form (GLOBAL-REF-POINT . NEW-REF-POINT), where
62GLOBAL-REF-POINT is a reference point in the overall glyphs already 62GLOBAL-REF-POINT is a reference point in the overall glyphs already
63composed, and NEW-REF-POINT is a reference point in the new glyph to 63composed, and NEW-REF-POINT is a reference point in the new glyph to
64be added. 64be added.
@@ -71,13 +71,13 @@ follows (the point `*' corresponds to both reference points):
71 | | | 71 | | |
72 | global| | 72 | global| |
73 | glyph | | 73 | glyph | |
74 -- | | |-- <--- baseline \(doesn't change) 74 -- | | |-- <--- baseline (doesn't change)
75 +----+--*--+ 75 +----+--*--+
76 | | new | 76 | | new |
77 | |glyph| 77 | |glyph|
78 +----+-----+ <--- new descent 78 +----+-----+ <--- new descent
79 79
80A composition rule may have the form \(GLOBAL-REF-POINT 80A composition rule may have the form (GLOBAL-REF-POINT
81NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specify how much 81NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specify how much
82to shift NEW-REF-POINT from GLOBAL-REF-POINT. In this case, XOFF 82to shift NEW-REF-POINT from GLOBAL-REF-POINT. In this case, XOFF
83and YOFF are integers in the range -100..100 representing the 83and YOFF are integers in the range -100..100 representing the
@@ -279,8 +279,8 @@ text in the composition."
279(defun compose-chars (&rest args) 279(defun compose-chars (&rest args)
280 "Return a string from arguments in which all characters are composed. 280 "Return a string from arguments in which all characters are composed.
281For relative composition, arguments are characters. 281For relative composition, arguments are characters.
282For rule-based composition, Mth \(where M is odd) arguments are 282For rule-based composition, Mth (where M is odd) arguments are
283characters, and Nth \(where N is even) arguments are composition rules. 283characters, and Nth (where N is even) arguments are composition rules.
284A composition rule is a cons of glyph reference points of the form 284A composition rule is a cons of glyph reference points of the form
285\(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of 285\(GLOBAL-REF-POINT . NEW-REF-POINT). See the documentation of
286`reference-point-alist' for more detail." 286`reference-point-alist' for more detail."
@@ -387,7 +387,7 @@ This function is the default value of `compose-chars-after-function'."
387(defun compose-last-chars (args) 387(defun compose-last-chars (args)
388 "Compose last characters. 388 "Compose last characters.
389The argument is a parameterized event of the form 389The argument is a parameterized event of the form
390 \(compose-last-chars N COMPONENTS), 390 (compose-last-chars N COMPONENTS),
391where N is the number of characters before point to compose, 391where N is the number of characters before point to compose,
392COMPONENTS, if non-nil, is the same as the argument to `compose-region' 392COMPONENTS, if non-nil, is the same as the argument to `compose-region'
393\(which see). If it is nil, `compose-chars-after' is called, 393\(which see). If it is nil, `compose-chars-after' is called,
@@ -640,7 +640,7 @@ All non-spacing characters have this function in
640 unicode-category-table)) 640 unicode-category-table))
641 641
642(defun compose-gstring-for-terminal (gstring) 642(defun compose-gstring-for-terminal (gstring)
643 "Compose glyph string GSTRING for terminal display. 643 "Compose glyph-string GSTRING for terminal display.
644Non-spacing characters are composed with the preceding base 644Non-spacing characters are composed with the preceding base
645character. If the preceding character is not a base character, 645character. If the preceding character is not a base character,
646each non-spacing character is composed as a spacing character by 646each non-spacing character is composed as a spacing character by