diff options
| author | Juanma Barranquero | 2011-11-12 00:17:16 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2011-11-12 00:17:16 +0100 |
| commit | 40a8bdf60f261d476869cdb1276a00e5641ceba4 (patch) | |
| tree | 488dedb136898934dfab888db07493ac31a0cfb6 | |
| parent | 97f18cc83d911b1722e00a2558cdff6532c3860a (diff) | |
| download | emacs-40a8bdf60f261d476869cdb1276a00e5641ceba4.tar.gz emacs-40a8bdf60f261d476869cdb1276a00e5641ceba4.zip | |
Fix typos.
| -rw-r--r-- | admin/grammars/python.wy | 2 | ||||
| -rw-r--r-- | admin/nt/README-ftp-server | 2 | ||||
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/semantic.texi | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ChangeLog.9 | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/bovine/c.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/decorate/include.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/tag-file.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/srecode/getset.el | 2 | ||||
| -rw-r--r-- | lisp/ezimage.el | 4 | ||||
| -rw-r--r-- | lisp/org/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/org/org-list.el | 4 | ||||
| -rw-r--r-- | lisp/org/org-plot.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/idlw-shell.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 2 | ||||
| -rw-r--r-- | nt/README.W32 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.11 | 6 | ||||
| -rw-r--r-- | src/ChangeLog.8 | 2 | ||||
| -rw-r--r-- | src/s/hpux10-20.h | 2 | ||||
| -rw-r--r-- | src/xfaces.c | 2 |
21 files changed, 36 insertions, 23 deletions
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index a0af813e5e8..b30305ee78a 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy | |||
| @@ -828,7 +828,7 @@ paren_classes | |||
| 828 | ; | 828 | ; |
| 829 | 829 | ||
| 830 | ;; In general, the base class can be specified by a general expression | 830 | ;; In general, the base class can be specified by a general expression |
| 831 | ;; which evalue to a class object, i.e., base classes are not just names! | 831 | ;; which evaluates to a class object, i.e., base classes are not just names! |
| 832 | ;; However base classes are names in most cases. Thus the | 832 | ;; However base classes are names in most cases. Thus the |
| 833 | ;; non-terminals below work only with simple names. Even if the | 833 | ;; non-terminals below work only with simple names. Even if the |
| 834 | ;; parser can parse general expressions, I don't see much benefit in | 834 | ;; parser can parse general expressions, I don't see much benefit in |
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 5dee94f28c5..3c70ed8dbe0 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server | |||
| @@ -92,7 +92,7 @@ See the end of the file for license conditions. | |||
| 92 | or libpng.dll. LibPNG requires zlib, which should come from the same | 92 | or libpng.dll. LibPNG requires zlib, which should come from the same |
| 93 | source as you got libpng. | 93 | source as you got libpng. |
| 94 | 94 | ||
| 95 | JPEG: requires the Independant JPEG Group's libjpeg 6b or later, | 95 | JPEG: requires the Independent JPEG Group's libjpeg 6b or later, |
| 96 | which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. | 96 | which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. |
| 97 | 97 | ||
| 98 | TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll | 98 | TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll |
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 029406e2d30..af8d38a077f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-11-11 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * semantic.texi (Tag handling): Fix typo. | ||
| 4 | |||
| 1 | 2011-10-31 Katsumi Yamaoka <yamaoka@jpl.org> | 5 | 2011-10-31 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | 6 | ||
| 3 | * gnus.texi (Other Gnus Versions): Remove. | 7 | * gnus.texi (Other Gnus Versions): Remove. |
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index f3f11d29f17..f6cf7a07ae8 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi | |||
| @@ -306,7 +306,7 @@ Files associated with tags. Goto-tag, file for include, and file for | |||
| 306 | a prototype. | 306 | a prototype. |
| 307 | 307 | ||
| 308 | @item semantic-tag-ls.el | 308 | @item semantic-tag-ls.el |
| 309 | Language dependant features of a tag, such as parent calculation, slot | 309 | Language dependent features of a tag, such as parent calculation, slot |
| 310 | protection, and other states like abstract, virtual, static, and leaf. | 310 | protection, and other states like abstract, virtual, static, and leaf. |
| 311 | 311 | ||
| 312 | @item semantic-dep.el | 312 | @item semantic-dep.el |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6cd58cd3d22..fd403ee047f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-11-11 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/idlw-shell.el (idlwave-shell-make-new-bp-overlay): | ||
| 4 | * textmodes/sgml-mode.el (html-tag-help): Fix typos. | ||
| 5 | |||
| 1 | 2011-11-11 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2011-11-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * electric.el (electric-indent-post-self-insert-function): Make it | 8 | * electric.el (electric-indent-post-self-insert-function): Make it |
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 14214ccc3d3..edfe26fbc03 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 | |||
| @@ -2628,7 +2628,7 @@ | |||
| 2628 | 2628 | ||
| 2629 | 2001-07-06 Vinicius Jose Latorre <vinicius@cpqd.com.br> | 2629 | 2001-07-06 Vinicius Jose Latorre <vinicius@cpqd.com.br> |
| 2630 | 2630 | ||
| 2631 | * ps-print.el: Use locale dependant date to print date in header. | 2631 | * ps-print.el: Use locale dependent date to print date in header. |
| 2632 | Doc fix. | 2632 | Doc fix. |
| 2633 | (ps-print-version): New version number (6.5.3). | 2633 | (ps-print-version): New version number (6.5.3). |
| 2634 | (ps-right-header, ps-right-footer): Initialization and doc fix. | 2634 | (ps-right-header, ps-right-footer): Initialization and doc fix. |
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 0b3e6881891..1076402ac91 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el | |||
| @@ -249,7 +249,7 @@ Return the defined symbol as a special spp lex token." | |||
| 249 | (point)))) | 249 | (point)))) |
| 250 | ) | 250 | ) |
| 251 | 251 | ||
| 252 | ;; Only do argument checking if the paren was immediatly after | 252 | ;; Only do argument checking if the paren was immediately after |
| 253 | ;; the macro name. | 253 | ;; the macro name. |
| 254 | (if with-args | 254 | (if with-args |
| 255 | (semantic-lex-spp-first-token-arg-list (car raw-stream))) | 255 | (semantic-lex-spp-first-token-arg-list (car raw-stream))) |
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index e984965a737..a37f43d177f 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el | |||
| @@ -296,7 +296,7 @@ This mode provides a nice context menu on the include statements." | |||
| 296 | ;; Set ourselves up for synchronization | 296 | ;; Set ourselves up for synchronization |
| 297 | (semanticdb-cache-get | 297 | (semanticdb-cache-get |
| 298 | table 'semantic-decoration-unparsed-include-cache) | 298 | table 'semantic-decoration-unparsed-include-cache) |
| 299 | ;; Add a dependancy. | 299 | ;; Add a dependency. |
| 300 | (let ((table semanticdb-current-table)) | 300 | (let ((table semanticdb-current-table)) |
| 301 | (semanticdb-add-reference table tag)) | 301 | (semanticdb-add-reference table tag)) |
| 302 | ) | 302 | ) |
diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el index 17fd3b45356..d118d9b6203 100644 --- a/lisp/cedet/semantic/tag-file.el +++ b/lisp/cedet/semantic/tag-file.el | |||
| @@ -154,7 +154,7 @@ Depends on `semantic-dependency-include-path' for searching. Always searches | |||
| 154 | (setq result | 154 | (setq result |
| 155 | ;; I don't have a plan for refreshing tags with a dependency | 155 | ;; I don't have a plan for refreshing tags with a dependency |
| 156 | ;; stuck on them somehow. I'm thinking that putting a cache | 156 | ;; stuck on them somehow. I'm thinking that putting a cache |
| 157 | ;; onto the dependancy finding with a hash table might be best. | 157 | ;; onto the dependency finding with a hash table might be best. |
| 158 | ;;(if (semantic--tag-get-property tag 'dependency-file) | 158 | ;;(if (semantic--tag-get-property tag 'dependency-file) |
| 159 | ;; (semantic--tag-get-property tag 'dependency-file) | 159 | ;; (semantic--tag-get-property tag 'dependency-file) |
| 160 | (:override | 160 | (:override |
diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el index a582d4ff59e..9a6c27dcd73 100644 --- a/lisp/cedet/srecode/getset.el +++ b/lisp/cedet/srecode/getset.el | |||
| @@ -215,7 +215,7 @@ INCLASS specifies if the cursor is already in CLASS or not." | |||
| 215 | (when (not te) | 215 | (when (not te) |
| 216 | (message "Unknown location for tag-end in %s:" (semantic-tag-name aftertag))) | 216 | (message "Unknown location for tag-end in %s:" (semantic-tag-name aftertag))) |
| 217 | (goto-char te) | 217 | (goto-char te) |
| 218 | ;; If there is a comment immediatly after aftertag, skip over it. | 218 | ;; If there is a comment immediately after aftertag, skip over it. |
| 219 | (when (looking-at (concat "\\s-*\n?\\s-*" semantic-lex-comment-regex)) | 219 | (when (looking-at (concat "\\s-*\n?\\s-*" semantic-lex-comment-regex)) |
| 220 | (let ((pos (point)) | 220 | (let ((pos (point)) |
| 221 | (rnext (semantic-find-tag-by-overlay-next (point)))) | 221 | (rnext (semantic-find-tag-by-overlay-next (point)))) |
diff --git a/lisp/ezimage.el b/lisp/ezimage.el index b828f79f8fa..e8680b65d96 100644 --- a/lisp/ezimage.el +++ b/lisp/ezimage.el | |||
| @@ -257,9 +257,9 @@ Optional argument STRING is a string upon which to add text properties." | |||
| 257 | (a (assoc bt ezimage-expand-image-button-alist))) | 257 | (a (assoc bt ezimage-expand-image-button-alist))) |
| 258 | ;; Regular images (created with `insert-image' are intangible | 258 | ;; Regular images (created with `insert-image' are intangible |
| 259 | ;; which (I suppose) make them more compatible with XEmacs 21. | 259 | ;; which (I suppose) make them more compatible with XEmacs 21. |
| 260 | ;; Unfortunatly, there is a giant pile o code dependent on the | 260 | ;; Unfortunately, there is a giant pile of code dependent on the |
| 261 | ;; underlying text. This means if we leave it tangible, then I | 261 | ;; underlying text. This means if we leave it tangible, then I |
| 262 | ;; don't have to change said giant piles o code. | 262 | ;; don't have to change said giant piles of code. |
| 263 | (if (and a (symbol-value (cdr a))) | 263 | (if (and a (symbol-value (cdr a))) |
| 264 | (ezimage-insert-over-text (symbol-value (cdr a)) | 264 | (ezimage-insert-over-text (symbol-value (cdr a)) |
| 265 | start | 265 | start |
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index ae150621dc0..468825937b5 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-11-11 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring. | ||
| 4 | |||
| 1 | 2011-09-27 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-09-27 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * org.el (org-mode): Force left-to-right paragraphs in Org | 7 | * org.el (org-mode): Force left-to-right paragraphs in Org |
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index d3c5dd99aa6..866176e4e8f 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el | |||
| @@ -70,12 +70,12 @@ | |||
| 70 | ;; (a few thousand lines long). Thus, code should follow the rule : | 70 | ;; (a few thousand lines long). Thus, code should follow the rule : |
| 71 | ;; "collect once, use many". As a corollary, it is usally a bad idea | 71 | ;; "collect once, use many". As a corollary, it is usally a bad idea |
| 72 | ;; to use directly an interactive function inside the code, as those, | 72 | ;; to use directly an interactive function inside the code, as those, |
| 73 | ;; being independant entities, read the whole list structure another | 73 | ;; being independent entities, read the whole list structure another |
| 74 | ;; time. | 74 | ;; time. |
| 75 | 75 | ||
| 76 | ;;; Code: | 76 | ;;; Code: |
| 77 | 77 | ||
| 78 | (eval-when-compile | 78 | (eval-when-compile |
| 79 | (require 'cl)) | 79 | (require 'cl)) |
| 80 | (require 'org-macs) | 80 | (require 'org-macs) |
| 81 | (require 'org-compat) | 81 | (require 'org-compat) |
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el index b90c248eb6d..419467226c9 100644 --- a/lisp/org/org-plot.el +++ b/lisp/org/org-plot.el | |||
| @@ -136,7 +136,7 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE." | |||
| 136 | "Export the data in TABLE to DATA-FILE for gnuplot. | 136 | "Export the data in TABLE to DATA-FILE for gnuplot. |
| 137 | This means in a format appropriate for grid plotting by gnuplot. | 137 | This means in a format appropriate for grid plotting by gnuplot. |
| 138 | PARAMS specifies which columns of TABLE should be plotted as independent | 138 | PARAMS specifies which columns of TABLE should be plotted as independent |
| 139 | and dependant variables." | 139 | and dependent variables." |
| 140 | (interactive) | 140 | (interactive) |
| 141 | (let* ((ind (- (plist-get params :ind) 1)) | 141 | (let* ((ind (- (plist-get params :ind) 1)) |
| 142 | (deps (if (plist-member params :deps) | 142 | (deps (if (plist-member params :deps) |
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 18f47d14a3f..453badfa46b 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el | |||
| @@ -959,7 +959,7 @@ IDL has currently stepped.") | |||
| 959 | ;; Can not use history expansion because "!" is used for system variables. | 959 | ;; Can not use history expansion because "!" is used for system variables. |
| 960 | (setq comint-input-autoexpand nil) | 960 | (setq comint-input-autoexpand nil) |
| 961 | ;; (setq comint-input-ring-size 64) | 961 | ;; (setq comint-input-ring-size 64) |
| 962 | 962 | ||
| 963 | (set (make-local-variable 'completion-ignore-case) t) | 963 | (set (make-local-variable 'completion-ignore-case) t) |
| 964 | (set (make-local-variable 'comint-completion-addsuffix) '("/" . "")) | 964 | (set (make-local-variable 'comint-completion-addsuffix) '("/" . "")) |
| 965 | (setq comint-input-ignoredups t) | 965 | (setq comint-input-ignoredups t) |
| @@ -3707,7 +3707,7 @@ Existing overlays are recycled, in order to minimize consumption." | |||
| 3707 | (defun idlwave-shell-make-new-bp-overlay (&optional type disabled) | 3707 | (defun idlwave-shell-make-new-bp-overlay (&optional type disabled) |
| 3708 | "Make a new overlay for highlighting breakpoints. | 3708 | "Make a new overlay for highlighting breakpoints. |
| 3709 | 3709 | ||
| 3710 | This stuff is strongly dependant upon the version of Emacs. If TYPE | 3710 | This stuff is strongly dependent upon the version of Emacs. If TYPE |
| 3711 | is passed, make an overlay of that type ('bp or 'bp-cond, currently | 3711 | is passed, make an overlay of that type ('bp or 'bp-cond, currently |
| 3712 | only for glyphs)." | 3712 | only for glyphs)." |
| 3713 | (let ((ov (make-overlay 1 1)) | 3713 | (let ((ov (make-overlay 1 1)) |
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index be8dd9c9130..5b23a24259a 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el | |||
| @@ -1872,7 +1872,7 @@ This takes effect when first loading the library.") | |||
| 1872 | ("dir" . "Directory list (obsolete)") | 1872 | ("dir" . "Directory list (obsolete)") |
| 1873 | ("div" . "Generic block-level container") | 1873 | ("div" . "Generic block-level container") |
| 1874 | ("dl" . "Definition list") | 1874 | ("dl" . "Definition list") |
| 1875 | ("dt" . "Term to be definined") | 1875 | ("dt" . "Term to be defined") |
| 1876 | ("em" . "Emphasized") | 1876 | ("em" . "Emphasized") |
| 1877 | ("embed" . "Embedded data in foreign format") | 1877 | ("embed" . "Embedded data in foreign format") |
| 1878 | ("fig" . "Figure") | 1878 | ("fig" . "Figure") |
diff --git a/nt/README.W32 b/nt/README.W32 index e4044e409d4..259a0ea6e41 100644 --- a/nt/README.W32 +++ b/nt/README.W32 | |||
| @@ -142,7 +142,7 @@ See the end of the file for license conditions. | |||
| 142 | the PNG support will not work, and you will have to download | 142 | the PNG support will not work, and you will have to download |
| 143 | newer versions. | 143 | newer versions. |
| 144 | 144 | ||
| 145 | JPEG: requires the Independant JPEG Group's libjpeg 6b or later, | 145 | JPEG: requires the Independent JPEG Group's libjpeg 6b or later, |
| 146 | which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. | 146 | which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. |
| 147 | 147 | ||
| 148 | TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll | 148 | TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll |
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 0a9df7d1aee..bd1a6ec5918 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 | |||
| @@ -7949,7 +7949,7 @@ | |||
| 7949 | 2010-05-11 Karel Klíč <kklic@redhat.com> | 7949 | 2010-05-11 Karel Klíč <kklic@redhat.com> |
| 7950 | 7950 | ||
| 7951 | * ftfont.c: Fix incorrect parentheses of #if condition for | 7951 | * ftfont.c: Fix incorrect parentheses of #if condition for |
| 7952 | definining M17N_FLT_USE_NEW_FEATURE. | 7952 | defining M17N_FLT_USE_NEW_FEATURE. |
| 7953 | 7953 | ||
| 7954 | 2010-05-11 Glenn Morris <rgm@gnu.org> | 7954 | 2010-05-11 Glenn Morris <rgm@gnu.org> |
| 7955 | 7955 | ||
| @@ -25474,7 +25474,7 @@ | |||
| 25474 | 25474 | ||
| 25475 | * term.c (terminal_encode_buffer): Make externally visible. | 25475 | * term.c (terminal_encode_buffer): Make externally visible. |
| 25476 | 25476 | ||
| 25477 | * makefile.w32-in: Add character.h dependancies. | 25477 | * makefile.w32-in: Add character.h dependencies. |
| 25478 | (character.o, chartab.o): New targets. | 25478 | (character.o, chartab.o): New targets. |
| 25479 | 25479 | ||
| 25480 | 2008-02-01 Kenichi Handa <handa@m17n.org> | 25480 | 2008-02-01 Kenichi Handa <handa@m17n.org> |
| @@ -29718,7 +29718,7 @@ | |||
| 29718 | * keyboard.c (restore_kboard_configuration): Only define when | 29718 | * keyboard.c (restore_kboard_configuration): Only define when |
| 29719 | MULTI_KBOARD defined. | 29719 | MULTI_KBOARD defined. |
| 29720 | 29720 | ||
| 29721 | * makefile.w32-in: Update dependancies from Makefile.in. | 29721 | * makefile.w32-in: Update dependencies from Makefile.in. |
| 29722 | (OBJ1): Add terminal.$(O) | 29722 | (OBJ1): Add terminal.$(O) |
| 29723 | 29723 | ||
| 29724 | * term.c (dissociate_if_controlling_tty) [WINDOWSNT]: | 29724 | * term.c (dissociate_if_controlling_tty) [WINDOWSNT]: |
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 833119c9fcf..6fd4d5dea27 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 | |||
| @@ -13404,7 +13404,7 @@ | |||
| 13404 | 13404 | ||
| 13405 | 1998-10-20 Jason Rumney <jasonr@altavista.net> | 13405 | 1998-10-20 Jason Rumney <jasonr@altavista.net> |
| 13406 | 13406 | ||
| 13407 | * makefile.nt (w32fns.c): Add x-list-font.c to dependancies. | 13407 | * makefile.nt (w32fns.c): Add x-list-font.c to dependencies. |
| 13408 | 13408 | ||
| 13409 | * w32faces.c: Update comments referring to obsolete structs. | 13409 | * w32faces.c: Update comments referring to obsolete structs. |
| 13410 | (allocate_face, copy_face, face_eql, load_font) | 13410 | (allocate_face, copy_face, face_eql, load_font) |
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 1cd91a41b55..37199bcc29b 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h | |||
| @@ -89,7 +89,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 89 | #undef HAVE_RANDOM | 89 | #undef HAVE_RANDOM |
| 90 | 90 | ||
| 91 | 91 | ||
| 92 | /* Rainer Malzbender <rainer@displaytech.com> says definining | 92 | /* Rainer Malzbender <rainer@displaytech.com> says defining |
| 93 | HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ | 93 | HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ |
| 94 | #ifndef HAVE_XRMSETDATABASE | 94 | #ifndef HAVE_XRMSETDATABASE |
| 95 | #define HAVE_XRMSETDATABASE | 95 | #define HAVE_XRMSETDATABASE |
diff --git a/src/xfaces.c b/src/xfaces.c index 9faa7c79e0b..0ed6fa1d8e2 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -27,7 +27,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 27 | 27 | ||
| 28 | 1. Font family name. | 28 | 1. Font family name. |
| 29 | 29 | ||
| 30 | 2. Font foundary name. | 30 | 2. Font foundry name. |
| 31 | 31 | ||
| 32 | 3. Relative proportionate width, aka character set width or set | 32 | 3. Relative proportionate width, aka character set width or set |
| 33 | width (swidth), e.g. `semi-compressed'. | 33 | width (swidth), e.g. `semi-compressed'. |