Mercurial > emacs
changeset 110990:7b9f631537db
merge emacs-23
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 14 Oct 2010 11:06:31 +0900 |
| parents | 287d5a665560 (current diff) 36726f009542 (diff) |
| children | b74f1db2d13f 12afc39096c2 |
| files | lisp/ChangeLog |
| diffstat | 52 files changed, 319 insertions(+), 229 deletions(-) [+] |
line wrap: on
line diff
--- a/admin/unidata/unidata-gen.el Thu Oct 14 11:03:25 2010 +0900 +++ b/admin/unidata/unidata-gen.el Thu Oct 14 11:06:31 2010 +0900 @@ -95,7 +95,7 @@ (with-temp-buffer ;; Insert a file of this format: ;; (CHAR NAME CATEGORY ...) - ;; where CHAR is a charater code, the following elements are strings + ;; where CHAR is a character code, the following elements are strings ;; representing character properties. (insert-file-contents unidata-text-file) (goto-char (point-min))
--- a/doc/emacs/ChangeLog Thu Oct 14 11:03:25 2010 +0900 +++ b/doc/emacs/ChangeLog Thu Oct 14 11:06:31 2010 +0900 @@ -147,7 +147,7 @@ * custom.texi (Init Examples): Add xref to Mail Header. - * emacs.texi (Top): Fix xrefs. + * emacs.texi (Top): Fix xrefs. 2010-03-25 Chong Yidong <cyd@stupidchicken.com>
--- a/etc/ChangeLog Thu Oct 14 11:03:25 2010 +0900 +++ b/etc/ChangeLog Thu Oct 14 11:06:31 2010 +0900 @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero <lekktu@gmail.com> + + * tutorials/TUTORIAL.es: Fix typos. + 2010-09-21 Eric Ludlam <zappo@gnu.org> * srecode/java.srt: Make NAME be a prompt.
--- a/etc/tutorials/TUTORIAL.es Thu Oct 14 11:03:25 2010 +0900 +++ b/etc/tutorials/TUTORIAL.es Thu Oct 14 11:06:31 2010 +0900 @@ -1,4 +1,4 @@ -Tutorial de Emacs. Vea al final las condiciones de copiado. +Tutorial de Emacs. Vea al final las condiciones de copiado. Generalmente los comandos de Emacs involucran la tecla CONTROL (algunas veces llamada CTRL O CTL) o la tecla meta (algunas veces @@ -17,7 +17,7 @@ caracteres). Los caracteres ">>" en el margen izquierdo indican instrucciones para que usted trate de usar un comando. Por ejemplo: <<Blank lines inserted around following line by help-with-tutorial>> -[Mitad de página en blanco para propósitos didácticos. El texto continúa abajo] +[Mitad de página en blanco para propósitos didácticos. El texto continúa abajo] >> Ahora teclee C-v (ver la próxima pantalla) para desplazarse a la siguiente pantalla (hágalo manteniendo la tecla control oprimida mientras teclea v). Desde ahora debería hacer esto @@ -75,7 +75,7 @@ Línea siguiente, C-n >> Mueva el cursor a la línea en la mitad del diagrama - usando C-n o C-p. Luego teclee C-l para ver el + usando C-n o C-p. Luego teclee C-l para ver el diagrama completo centrado en la pantalla. Le resultará fácil recordar estas letras por las palabras que @@ -200,7 +200,7 @@ C-u y luego los dígitos antes de introducir los comandos. Si tiene una tecla META (o EDIT o ALT), hay una manera alternativa para ingresar un argumento numérico: teclear los dígitos mientras presiona -la tecla META. Recomendamos aprender el método C-u porque este +la tecla META. Recomendamos aprender el método C-u porque éste funciona en cualquier terminal. El argumento numérico es también llamado un "argumento prefijo", porque usted teclea el argumento antes del comando al que se aplica. @@ -321,13 +321,13 @@ <Delback> es una tecla en el teclado--la misma que normalmente usa fuera de emacs para borrar el último carácter que escribió. Normalmente es una tecla una o dos filas arriba de la tecla <Return>, -y que esta usualmente rotulada como "Backspace", "Del" o simplemente +y que está usualmente rotulada como "Backspace", "Del" o simplemente con una flecha en dirección izquierda que no es parte de las teclas de flecha. -Si la tecla larga esta rotulada "Backspace", entonces esa es la que -debe de usar para <Delback>. Puede haber otra tecla llamada "Del" en -otra parte, pero esa no es <Delback>. +Si la tecla larga está rotulada "Backspace", entonces ésa es la que +debe de usar para <Delback>. Puede haber otra tecla llamada "Del" en +otra parte, pero ésa no es <Delback>. Generalmente, <Delback> borra el carácter inmediatamente anterior a la posición actual del cursor. @@ -393,7 +393,7 @@ entre las dos posiciones. >> Mueva el cursor a la letra T del inicio del párrafo anterior. ->> Teclee C-SPC. Emacs debe mostrar el mensaje "Mark set" en la parte +>> Teclee C-SPC. Emacs debe mostrar el mensaje "Mark set" en la parte de abajo de la pantalla. >> Mueva el cursor a la x en "extremo", en la segunda línea del párrafo. @@ -405,7 +405,7 @@ reinsertadas. La reinserción de texto eliminado se llama "yanking" o "pegar". Generalmente, los comandos que pueden quitar mucho texto lo eliminan, mientras que los comandos que quitan solo un carácter, o -solo lineas en blanco y espacios, borran (para que no pueda pegar ese +solo líneas en blanco y espacios, borran (para que no pueda pegar ese texto). >> Mueva el cursor al comienzo de una línea que no esté vacía. @@ -417,14 +417,14 @@ y un segundo C-k elimina la línea misma, y hace que todas las otras líneas se muevan hacia arriba. C-k trata un argumento numérico especialmente: Elimina ese número de líneas y TAMBIÉN sus -contenidos. Esto no es una simple repetición. C-u 2 C-k elimina dos +contenidos. Esto no es una simple repetición. C-u 2 C-k elimina dos líneas y sus nuevas líneas, tecleando C-k dos veces no hace esto. Traer texto eliminado de regreso es llamado "yanking" o "pegar". (Piense en ello como pegar de nuevo, o traer de vuelta, algún texto que le fue quitado.) Puede pegar el texto eliminado en, ya sea el lugar en que fue eliminado, o en otra parte del buffer, o hasta en un -archivo diferente. Puede pegar el texto varias veces, lo que hace +archivo diferente. Puede pegar el texto varias veces, lo que hace varias copias de él. El comando para pegar es C-y. Reinserta el último texto eliminado, en @@ -460,7 +460,7 @@ Luego teclee M-y y será reemplazado por la primera línea eliminada. Teclee más veces M-y y vea lo que obtiene. Siga haciéndolo hasta que la segunda línea eliminada regrese, y entonces unas pocas - más. Si quiere, puede tratar de darle a M-y argumentos positivos y + más. Si quiere, puede tratar de darle a M-y argumentos positivos y negativos. @@ -477,7 +477,7 @@ Pero hay dos excepciones: los comandos que no cambian el texto no cuentan (esto incluye los comandos de movimiento del cursor y el comando de desplazamiento), y los caracteres de autoinserción se -manejan usualmente en grupos de hasta 20. (Esto es para reducir el +manejan usualmente en grupos de hasta 20. (Esto es para reducir el numero de C-x u que tenga que teclear para deshacer una inserción en el texto.) @@ -504,7 +504,7 @@ Para que pueda hacer permanente el texto que edite, lo debe colocar en un archivo. De otra manera, éste se perderá cuando cierre Emacs. Para poder poner su texto en un archivo, debe "encontrar" el archivo -antes de ingresar el texto. (Esto se llama también "visitar" el +antes de ingresar el texto. (Esto se llama también "visitar" el archivo.) Encontrar un archivo significa que puede ver su contenido dentro de @@ -556,7 +556,7 @@ Esto copia el texto dentro de Emacs al archivo. La primera vez que haga esto, Emacs renombrará el archivo original con un nuevo nombre -para que este no se pierda. El nuevo nombre se hace agregando "~" al +para que éste no se pierda. El nuevo nombre se hace agregando "~" al final del nombre del archivo original. Cuando guardar haya terminado, Emacs mostrará el nombre del archivo @@ -595,13 +595,13 @@ Emacs. Para mirar la lista de los buffers que existen actualmente en su sesión de Emacs, teclee: - C-x C-b Lista de Buffers + C-x C-b Lista de buffers >> Pruebe C-x C-b ahora. Vea como cada buffer tiene un nombre, y además puede tener un nombre -de archivo para el archivo que contiene. CUALQUIER texto que vea en -una ventana de Emacs es siempre parte de algún Buffer. +de archivo para el archivo que contiene. CUALQUIER texto que vea en +una ventana de Emacs es siempre parte de algún buffer. >> Teclee C-x 1 para deshacerse de la lista de buffers. @@ -610,14 +610,14 @@ otro buffer, necesita "cambiar" a él. Si quiere cambiar a un buffer que corresponde a un archivo, puede hacerlo visitando el archivo de nuevo con C-x C-f. Pero existe una manera más rápida: use el comando -C-x b. En ese comando, necesita teclear el nombre de buffer. +C-x b. En ese comando, necesita teclear el nombre de buffer. >> Teclee C-x b foo <Return> para volver al buffer "foo" que contiene el texto del archivo "foo". Después teclee C-x b TUTORIAL.es <Return> para regresar a este tutorial. La mayoría del tiempo el nombre del buffer es el mismo que el nombre -del archivo (sin la parte del directorio del archivo). Sin embargo, +del archivo (sin la parte del directorio del archivo). Sin embargo, esto no es así siempre. La lista de buffers que hace con C-x C-b siempre muestra el nombre de todos los buffers. @@ -638,7 +638,7 @@ segundo buffer de archivo no afecta al primero. Esto es muy útil, pero también significa que necesita una forma conveniente para guardar el archivo del primer buffer. Sería una molestia tener que volver a -este con C-x C-f para guardarlo con C-x C-s. Así tenemos +éste con C-x C-f para guardarlo con C-x C-s. Así tenemos C-x s Guardar algunos buffers @@ -655,10 +655,10 @@ Hay muchísimos más comandos de Emacs que los que podrían asignarse a todos los caracteres control y meta. Emacs puede darle la vuelta a -esto usando el comando X (eXtendido). Este viene de dos formas: +esto usando el comando X (eXtendido). Éste viene de dos formas: - C-x Carácter eXtendido. Seguido por un carácter. - M-x Comando eXtendido por nombre. Seguido por un nombre + C-x Carácter eXtendido. Seguido por un carácter. + M-x Comando eXtendido por nombre. Seguido por un nombre largo. Estos comandos son generalmente útiles pero menos usados que los @@ -713,7 +713,7 @@ caracteres a reemplazar, y la cadena de caracteres para reemplazarla. Debe terminar cada argumento con <Return>. ->> Mueva el cursor hacia la línea en blanco dos líneas abajo de esta. +>> Mueva el cursor hacia la línea en blanco dos líneas abajo de ésta. A continuación escriba M-x repl s<Return>cambiado<Return>alterado<Return>. @@ -762,7 +762,7 @@ Ya sabe qué significa el nombre del archivo: es el archivo que usted ha encontrado. -NN%-- indica su posición actual en el texto; esto significa que NN por ciento del texto está encima de la parte superior -de la pantalla. Si el principio del archivo está en la pantalla, este +de la pantalla. Si el principio del archivo está en la pantalla, éste dirá --Top-- en vez de --00%--. Si el final del texto está en la pantalla, dirá --Bot--. Si está mirando un texto tan pequeño que cabe en la pantalla, el modo de línea dirá --All--. @@ -776,7 +776,7 @@ La parte de la línea de modo dentro de los paréntesis es para indicarle en qué modo de edición está. El modo por omisión es -Fundamental, el cual está usando ahora. Este es un ejemplo de un +Fundamental, el cual está usando ahora. Éste es un ejemplo de un "modo mayor". Emacs tiene diferentes modos mayores. Algunos están hechos para @@ -841,7 +841,7 @@ Debe intercalar espacios porque Auto Fill sólo rompe líneas en los espacios. -El margen esta normalmente puesto en 70 caracteres, pero puede +El margen está normalmente puesto en 70 caracteres, pero puede cambiarlo con el comando C-x f. Debe indicar el margen deseado como un argumento numérico. @@ -1079,7 +1079,7 @@ valores pueda poner para adecuar el comportamiento de Emacs. Necesita teclear el nombre de la variable cuando Emacs pregunte por ella. - C-h a Comando Apropos. Teclee una palabra y Emacs hará una + C-h a Comando Apropos. Teclee una palabra y Emacs hará una lista de todos los comandos que contengan esa palabra. Todos estos comandos pueden ser invocados con META-x. Para algunos comandos, el Comando Apropos también @@ -1113,7 +1113,7 @@ --------------------- Puede aprender más de Emacs leyendo su manual, ya sea como libro o en -línea en el Info (use el menú Ayuda--"Help"--o teclee F10 h r). Dos +línea en el Info (use el menú Ayuda--"Help"--o teclee F10 h r). Dos características que pueden gustarle son la completación, que ahorra teclear, y dired, que simplifica el manejo de archivos. @@ -1126,7 +1126,7 @@ Dired le permite listar los archivos en un directorio (y opcionalmente sus subdirectorios), moverse alrededor de esa lista, visitar, -renombrar, borrar y aparte de eso operar en los archivos. Dired esta +renombrar, borrar y aparte de eso operar en los archivos. Dired está descrito en el Info en el manual de Emacs en el nodo llamado "Dired". El manual también describe otras características de Emacs. @@ -1189,7 +1189,7 @@ posterior como lo permite esta nota. Se permite distribuir versiones modificadas de este documento, o - porciones de este, bajo las condiciones anteriores, siempre que + porciones de éste, bajo las condiciones anteriores, siempre que ellas tengan nota visible especificando quién fue el último en alterarlas.
--- a/lisp/ChangeLog Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ChangeLog Thu Oct 14 11:06:31 2010 +0900 @@ -5,14 +5,24 @@ (ps-mule-begin-job): Fix for the case that only ENCODING is set in a font-spec (bug#7197). - 2010-10-10 Jan Djärv <jan.h.d@swipnet.se> - - * term/ns-win.el (ns-right-alternate-modifier): New defvar. - (ns-right-option-modifier): New alias for ns-right-alternate-modifier. - (mac-right-option-modifier): New alias for ns-right-option-modifier. - - * cus-start.el (all): ns-right-alternate-modifier is new. - +2010-10-13 Glenn Morris <rgm@gnu.org> + + * mail/emacsbug.el (report-emacs-bug): Mention debbugs.gnu.org. + +2010-10-12 Juanma Barranquero <lekktu@gmail.com> + + * international/mule.el (define-coding-system): + * international/titdic-cnv.el (quail-cxterm-package-ext-info): + * composite.el (compose-region): Fix typo in docstring. + +2010-10-10 Jan Djärv <jan.h.d@swipnet.se> + + * term/ns-win.el (ns-right-alternate-modifier): New defvar. + (ns-right-option-modifier): New alias for ns-right-alternate-modifier. + (mac-right-option-modifier): New alias for ns-right-option-modifier. + + * cus-start.el (all): ns-right-alternate-modifier is new. + 2010-10-10 Andreas Schwab <schwab@linux-m68k.org> * Makefile.in (ELCFILES): Update. @@ -25,7 +35,7 @@ 2010-10-09 Richard Sharman <richard_sharman@mitel.com> (tiny change) * progmodes/gdb-ui.el (gdb-mouse-toggle-breakpoint-margin) - (gdb-mouse-toggle-breakpoint-fringe): Correct regexp to + (gdb-mouse-toggle-breakpoint-fringe): Correct regexp to work when breakpoint number exceeds nine. 2010-10-05 David Koppelman <koppel@ece.lsu.edu> @@ -1068,7 +1078,7 @@ 2010-05-03 Chong Yidong <cyd@stupidchicken.com> - * international/mule.el (auto-coding-alist): Only purecopy + * international/mule.el (auto-coding-alist): Only purecopy car of each item, not the whole list (Bug#6083). 2010-05-02 Chong Yidong <cyd@stupidchicken.com>
--- a/lisp/ChangeLog.1 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ChangeLog.1 Thu Oct 14 11:06:31 2010 +0900 @@ -570,11 +570,11 @@ 1986-01-18 Richard M. Stallman (rms@prep) - * doctor.el: Fix typo "symtoms". + * doctor.el: Fix typo "symtoms". 1986-01-10 Richard Mlynarik (mly@prep) - * mail-utils.el (mail-fetch-field) + * mail-utils.el (mail-fetch-field): regexp-quote the argument. 1986-01-10 Richard M. Stallman (rms@prep) @@ -917,7 +917,7 @@ * files.el (normal-mode): New command to choose major mode automatically. - * inc-vers.el: Renamed from inc-version.el + * inc-vers.el: Renamed from inc-version.el for file name length reasons. * term/*.el: terminal-specific files found here now. @@ -2523,10 +2523,10 @@ No, this directory is added automatically to the path used by call-process. It should have worked before. - RMS - * loaddefs.el: C-z -> C-c in documentation for mail. + * loaddefs.el: C-z -> C-c in documentation for mail. autoload report-emacs-bug from emacsbug.el. - * emacsbug.el: New file. Reports bugs with version info. + * emacsbug.el: New file. Reports bugs with version info. * helper.el (Helper-describe-bindings): Make it describe local bindings faster by binding global map to @@ -2587,7 +2587,7 @@ 1985-06-11 K. Shane Hartman (shane@mit-prep) - * ebuff-menu.el: Make M-C-v scroll-other-window instead of + * ebuff-menu.el: Make M-C-v scroll-other-window instead of scroll-down. Make M-v scroll-down. * ebuff-menu.el, echistory.el: Made them use electric. @@ -2602,7 +2602,7 @@ Made it use helper.el. Remove kill-ring-save stuff pending use of new winning prin1-to-string for minibuffer hacking. - * view.el: Made it use helper.el. + * view.el: Made it use helper.el. * helper.el: New module for packages which want to do help without giving up @@ -2804,7 +2804,7 @@ 1985-06-01 K. Shane Hartman (shane@mit-prep) - * loaddefs.el: Update documentation for rmail. + * loaddefs.el: Update documentation for rmail. * lisp-mode.el (calculate-lisp-indent): Asked (fboundp 'lisp-indent-hook). Right question is boundp. @@ -2858,7 +2858,7 @@ Skip strings, comments, char constants. Find symbols even if they have no letters in them. - * mlsupport.el: Insert symbol-value call in use-local-map. + * mlsupport.el: Insert symbol-value call in use-local-map. Handle key codes > 127 in local-bind-to-key. Write ml-modify-syntax-entry.
--- a/lisp/ChangeLog.12 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ChangeLog.12 Thu Oct 14 11:06:31 2010 +0900 @@ -1140,7 +1140,7 @@ (rcirc-keepalive-seconds): Remove variable. (rcirc-server-name, rcirc-timeout-timer, rcirc-connecting) (rcirc-process, rcirc-user-disconnect): New variables. - (rcirc-connect): Initalize new variables. + (rcirc-connect): Initialize new variables. (rcirc-keepalive): Don't send keepalive pings before connection is completed. (rcirc-sentinel): Do mark all channels with activity when
--- a/lisp/ChangeLog.13 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ChangeLog.13 Thu Oct 14 11:06:31 2010 +0900 @@ -7567,7 +7567,7 @@ (ediff-setup-windows-plain-merge) (ediff-setup-windows-plain-compare, ediff-setup-control-frame) (ediff-refresh-control-frame, ediff-get-visible-buffer-window): - * ediff-util.el (ediff-setup-keymap, ) + * ediff-util.el (ediff-setup-keymap) (ediff-toggle-wide-display, ediff-toggle-multiframe) (ediff-toggle-use-toolbar, ediff-really-quit) (ediff-good-frame-under-mouse)
--- a/lisp/ChangeLog.14 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ChangeLog.14 Thu Oct 14 11:06:31 2010 +0900 @@ -640,7 +640,7 @@ 2009-04-11 Chong Yidong <cyd@stupidchicken.com> - * files.el (dir-locals-directory-cache): Rename from + * files.el (dir-locals-directory-cache): Rename from dir-locals-directory-alist. Change format to include the mtime of the directory-local variables file (Bug#2833). (dir-locals-set-directory-class): New arg mtime. Store it in
--- a/lisp/ChangeLog.7 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ChangeLog.7 Thu Oct 14 11:06:31 2010 +0900 @@ -1043,10 +1043,10 @@ (quail-prev-translation-block): Likewise. (quail-conversion-backward-char): Call quail-error instead of error. Set quail-translating to nil. - (quail-conversion-forward-char): Likewize. + (quail-conversion-forward-char): Likewise. (quail-conversion-delete-char): Call quail-error instead of error. If conversion region gets vacant, set quail-converting to nil. - (quail-conversion-backward-delete-char): Likewize. + (quail-conversion-backward-delete-char): Likewise. (quail-no-conversion): Just set quail-converting to nil. (quail-mouse-choose-completion): Call quai-error instead of error. (quail-choose-completion-string): Likewise.
--- a/lisp/ChangeLog.8 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ChangeLog.8 Thu Oct 14 11:06:31 2010 +0900 @@ -1172,7 +1172,7 @@ 1999-12-03 Kenichi Handa <handa@mule.m17n.org> - * international/mule-util.el (truncate-string-to-width): Docsting + * international/mule-util.el (truncate-string-to-width): Docstring fixed. 1999-12-02 Stefan Monnier <monnier@cs.yale.edu> @@ -4926,7 +4926,7 @@ * language/ethio-util.el (setup-ethiopic-environment-internal): Use quail-activate-hook instead of obsolete hook quail-mode-hook. - (exit-ethiopic-environment): Likewize. + (exit-ethiopic-environment): Likewise. 1999-06-12 Richard M. Stallman <rms@gnu.org>
--- a/lisp/ChangeLog.9 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ChangeLog.9 Thu Oct 14 11:06:31 2010 +0900 @@ -1667,7 +1667,7 @@ * Makefile.in (finder_setwins): Renamed from nonobsolete_setwins. Don't include term/. - * mail/sc.el: Moved to obsolete/. + * mail/sc.el: Moved to obsolete/. 2001-08-14 Vinicius Jose Latorre <vinicius@cpqd.com.br> @@ -5547,7 +5547,7 @@ 2001-02-12 Dave Love <d.love@dl.ac.uk> - * international/latin1-disp.el: Doc fixes. + * international/latin1-disp.el: Doc fixes. (latin1-display) <defgroup>: Add :link. (latin1-display) <function>: Set variable latin1-display. @@ -5773,7 +5773,7 @@ 2001-02-05 Kenichi Handa <handa@etl.go.jp> * isearch.el (isearch-forward): Add description about input method - in the docsting. + in the docstring. 2001-02-04 Stefan Monnier <monnier@cs.yale.edu> @@ -8121,7 +8121,7 @@ * dired.el (dired-get-filename): Return filename verbatim if LOCALP is `verbatim'. * dired-aux.el (dired-add-entry): Call `dired-get-filename' with - `verbatim' so that we don't inadvertently delete a non-existant + `verbatim' so that we don't inadvertently delete a non-existent directory name. 2000-11-27 Kenichi Handa <handa@etl.go.jp> @@ -8747,7 +8747,7 @@ 2000-11-13 Miles Bader <miles@gnu.org> * textmodes/fill.el (skip-line-prefix): New function. - (fill-region-as-paragraph, fill-region): Return the fill-prefix. + (fill-region-as-paragraph, fill-region): Return the fill-prefix. (fill-paragraph): Don't leave point inside the fill-prefix. * textmodes/refill.el (refill-fill-paragraph-at): Don't leave point inside the fill-prefix. @@ -10795,7 +10795,7 @@ 2000-10-06 Dave Love <fx@gnu.org> * textmodes/fill.el (sentence-end-double-space) - (sentence-end-without-period): Doc fix. + (sentence-end-without-period): Doc fix. (adaptive-fill-regexp): Purecopy. (unjustify-current-line): Use line-end-position. (fill-individual-paragraphs-prefix): Use line-beginning-position. @@ -11871,7 +11871,7 @@ * strokes.el: Sync with maintainer's current version with changes for Emacs, but avoid runtime cl and levents. - (toplevel): Change autoloads and compilation requires. + (toplevel): Change autoloads and compilation requires. (strokes-version, strokes-bug-address, strokes-lift): Values changed. (strokes-xpm-header, strokes-insinuated): New variable. @@ -11934,12 +11934,12 @@ 2000-09-14 Dave Love <fx@gnu.org> * toolbar/cancel.xpm, toolbar/close.xpm, toolbar/copy.xpm, - toolbar/cut.xpm, toolbar/exit.xpm, toolbar/fld_open.xpm, - toolbar/help.xpm, toolbar/info.xpm, toolbar/mail.xpm, - toolbar/mail_compose.xpm, toolbar/new.xpm, toolbar/open.xpm, - toolbar/paste.xpm, toolbar/preferences.xpm, toolbar/print.xpm, - toolbar/save.xpm, toolbar/saveas.xpm, toolbar/search-replace.xpm, - toolbar/search.xpm, toolbar/spell.xpm, toolbar/undo.xpm: New. + * toolbar/cut.xpm, toolbar/exit.xpm, toolbar/fld_open.xpm, + * toolbar/help.xpm, toolbar/info.xpm, toolbar/mail.xpm, + * toolbar/mail_compose.xpm, toolbar/new.xpm, toolbar/open.xpm, + * toolbar/paste.xpm, toolbar/preferences.xpm, toolbar/print.xpm, + * toolbar/save.xpm, toolbar/saveas.xpm, toolbar/search-replace.xpm, + * toolbar/search.xpm, toolbar/spell.xpm, toolbar/undo.xpm: New. From Tuomas Kuosmanen <tigert@gimp.org>. (Gnome icons fetched from <URL:http://tigert.gimp.org/gnome/gnome-stock/>.) @@ -14832,7 +14832,7 @@ (comint-replace-by-expanded-history) (comint-get-old-input-default, comint-show-output) (comint-backward-matching-input, comint-forward-matching-input) - (comint-next-prompt, comint-previous-prompt): Use field + (comint-next-prompt, comint-previous-prompt): Use field properties if comint-use-prompt-regexp-instead-of-fields is nil. (comint-line-beginning-position): New function. (comint-bol): Use comint-line-beginning-position. Make ARG optional. @@ -16606,7 +16606,7 @@ 0. Give correct argument to set-auto-coding-function. (tar-expunge): For goto-char, use (point-min), not 0. (tar-clear-modification-flags): For goto-char, use (point-min), not 1. - (tar-subfile-save-buffer): Likewize. + (tar-subfile-save-buffer): Likewise. * international/mule.el (after-insert-file-set-buffer-file-coding-system): Call @@ -16910,7 +16910,7 @@ (ccl-decode-viscii): Use translate-character. (ccl-encode-viscii, ccl-encode-viscii-font) (ccl-decode-vscii, ccl-encode-vscii, ccl-encode-vscii-font): - Likewize. + Likewise. * language/cyrillic.el: Remove eval-when-compile. (cyrillic-koi8-r-nonascii-translation-table): Define it as a @@ -16918,14 +16918,14 @@ (cyrillic-koi8-r-encode-table): Define it as a translation table made from the reverse map of above. (ccl-decode-koi8): Use translate-character. - (ccl-encode-koi8, ccl-encode-koi8-font): Likewize + (ccl-encode-koi8, ccl-encode-koi8-font): Likewise. (cyrillic-alternativnyj-nonascii-translation-table): Define it as a translation table made from cyrillic-alternativnyj-decode-table. (cyrillic-alternativnyj-encode-table): Define it as a translation table made from the reverse map of above. (ccl-decode-alternativnyj): Use translate-character. (ccl-encode-alternativnyj, ccl-encode-alternativnyj-font): - Likewize + Likewise. * international/mule-diag.el (non-iso-charset-alist): Specify translation table symbol instead of translation table itself. @@ -18040,7 +18040,7 @@ (help-xref-interned): Maybe insert face doc too. Separate sections with a line of hyphens. - * faces.el: Some doc fixes. Declare some functions obsolete. + * faces.el: Some doc fixes. Declare some functions obsolete. (describe-face): Add customize button. Return the help text. Fix prompt. @@ -18071,8 +18071,8 @@ * emacs-lisp/cl-macs.el: Doc fixes; mainly avoid duplicating arg list in doc string. Don't quote keyword symbols. - * emacs-lisp/cl.el: Likewise - * emacs-lisp/cl-seq.el: Likewise + * emacs-lisp/cl.el: Likewise. + * emacs-lisp/cl-seq.el: Likewise. 2000-05-05 Gerd Moellmann <gerd@gnu.org> @@ -19040,7 +19040,7 @@ (fontset-default-styles): Likewise. (x-modify-font-name): Function removed. (create-fontset-from-fontset-spec): Ignore the argument STYLE-VARIANT. - (create-fontset-from-ascii-font): Docsting adjusted for the above + (create-fontset-from-ascii-font): Docstring adjusted for the above change. (instantiate-fontset, resolve-fontset-name): Functions removed. (fontset-list): Now implemented by C code. @@ -20406,7 +20406,7 @@ 2000-01-10 Ken Stevens <k.stevens@ieee.org> - * ispell.el: Only define dictionaries in menus when they exist. + * ispell.el: Only define dictionaries in menus when they exist. (version18p): New variable. (version20p): New variable. (xemacsp): New variable.
--- a/lisp/cedet/ChangeLog Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/cedet/ChangeLog Thu Oct 14 11:06:31 2010 +0900 @@ -1,3 +1,9 @@ +2010-10-12 Juanma Barranquero <lekktu@gmail.com> + + * semantic/symref/list.el (semantic-symref-list-rename-open-hits): + Fix typo in message. + (semantic-symref-list-map-open-hits): Fix typo in docstring. + 2010-09-30 Chong Yidong <cyd@stupidchicken.com> * semantic/bovine/el.el: @@ -11,8 +17,8 @@ * semantic/db-typecache.el (semanticdb-typecache-find-default): * semantic/imenu.el (semantic-create-imenu-index): * semantic/grammar.el (semantic--grammar-macro-function-tag): - * semantic/fw.el (semanticdb-without-unloaded-file-searches): Fix - require. Suggested by David Engster. + * semantic/fw.el (semanticdb-without-unloaded-file-searches): + Fix require. Suggested by David Engster. * semantic/bovine/c-by.el: Regenerate.
--- a/lisp/cedet/ede/base.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/cedet/ede/base.el Thu Oct 14 11:06:31 2010 +0900 @@ -452,7 +452,7 @@ ;; Targets and projects are often associated with other files, such as ;; header files, documentation files and the like. Have strong ;; associations can make useful user commands to quickly navigate -;; between the files base on their assocaitions. +;; between the files based on their associations. ;; (defun ede-header-file () "Return the header file for the current buffer.
--- a/lisp/cedet/semantic/symref/list.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/cedet/semantic/symref/list.el Thu Oct 14 11:06:31 2010 +0900 @@ -492,7 +492,7 @@ (let ((count (semantic-symref-list-map-open-hits (lambda () (replace-match newname nil t))))) (semantic-symref-list-update-open-hits) - (message "Renamed %d occurances." count))) + (message "Renamed %d occurrences." count))) ;;; REFACTORING UTILITIES ;; @@ -501,7 +501,7 @@ (defun semantic-symref-list-map-open-hits (function) "For every open hit in the symref buffer, perform FUNCTION. The `match-data' will be set to a successful hit of the searched for symbol. -Return the number of occurances FUNCTION was operated upon." +Return the number of occurrences FUNCTION was operated upon." ;; First Pass in this function - a straight rename. ;; Second Pass - Allow context specification based on
--- a/lisp/composite.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/composite.el Thu Oct 14 11:06:31 2010 +0900 @@ -210,7 +210,7 @@ If it is a string, the elements are alternate characters. In this case, TAB element has a special meaning. If the first -characer is TAB, the glyphs are displayed with left padding space +character is TAB, the glyphs are displayed with left padding space so that no pixel overlaps with the previous column. If the last character is TAB, the glyphs are displayed with right padding space so that no pixel overlaps with the following column.
--- a/lisp/emacs-lisp/byte-opt.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/emacs-lisp/byte-opt.el Thu Oct 14 11:06:31 2010 +0900 @@ -383,7 +383,7 @@ (eq 'lambda (car-safe fn))) (let ((newform (byte-compile-unfold-lambda form))) (if (eq newform form) - ;; Some error occured, avoid infinite recursion + ;; Some error occurred, avoid infinite recursion form (byte-optimize-form-code-walker newform for-effect)))) ((memq fn '(let let*))
--- a/lisp/erc/ChangeLog Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/erc/ChangeLog Thu Oct 14 11:06:31 2010 +0900 @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero <lekktu@gmail.com> + + * erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring. + 2010-05-07 Chong Yidong <cyd@stupidchicken.com> * Version 23.2 released.
--- a/lisp/erc/erc-xdcc.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/erc/erc-xdcc.el Thu Oct 14 11:06:31 2010 +0900 @@ -56,7 +56,7 @@ (erc-current-nick) " XDCC send #\" to get a particular file number.")) "*Help text sent in response to XDCC help command. A list of messages, each consisting of strings and expressions, expressions -being evaluated and should return stings." +being evaluated and should return strings." :group 'erc-dcc :type '(repeat (repeat :tag "Message" (choice string sexp))))
--- a/lisp/gnus/ChangeLog Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/gnus/ChangeLog Thu Oct 14 11:06:31 2010 +0900 @@ -1,3 +1,7 @@ +2010-10-12 Juanma Barranquero <lekktu@gmail.com> + + * nnmail.el (nnmail-fancy-expiry-targets): Fix typo in docstring. + 2010-09-21 Glenn Morris <rgm@gnu.org> * message.el (message-output): Use gnus-output-to-rmail if a buffer is
--- a/lisp/gnus/ChangeLog.2 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/gnus/ChangeLog.2 Thu Oct 14 11:06:31 2010 +0900 @@ -2603,7 +2603,7 @@ * message.el (message-use-idna): Use mm-coding-system-p. (message-tokenize-header, message-make-organization) - (message-make-from): Use with-temp-buffer. + (message-make-from): Use with-temp-buffer. (message-set-work-buffer): Deleted. (message-fill-paragraph): Use `if' not `and' for compiler warning. (message-check-news-header-syntax): Remove useless lambda. @@ -5550,7 +5550,7 @@ * gnus-audio.el (gnus-audio-au-player): Use executable-find. -2003-01-13 Jhair Tocancipa Triana <jhair_tocancipa@@gmx.net> +2003-01-13 Jhair Tocancipa Triana <jhair_tocancipa@gmx.net> * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use /usr/bin/play as default player. @@ -5643,7 +5643,7 @@ 2003-01-12 Raymond Scholz <ray-2003@zonix.de> - * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a + * gnus-msg.el (gnus-confirm-mail-reply-to-news): May be a regexp or a function too. (gnus-confirm-treat-mail-like-news): New variable. Ask for confirmation even if the original article is mail. @@ -12167,7 +12167,7 @@ 2001-12-05 12:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> * gnus-group.el (gnus-group-find-new-groups): Fix doc. - From: Stefan Monnier <monnier@cs.yale.edu> + From: Stefan Monnier <monnier@cs.yale.edu> 2001-12-05 Katsumi Yamaoka <yamaoka@jpl.org> @@ -14682,7 +14682,7 @@ * gnus-eform.el (gnus-edit-form-done): Return nil if end-of-file. 2001-07-16 12:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> - From: Stefan Monnier <monnier@cs.yale.edu> + From: Stefan Monnier <monnier@cs.yale.edu> * message.el (message-mode): Use define-derived-mode. (message-tab): message-completion-alist. @@ -16855,7 +16855,7 @@ * gnus-msg.el (gnus-summary-mail-forward): ??? - * message.el (message-forward): Move mime-to-mml here. + * message.el (message-forward): Move mime-to-mml here. 2000-12-20 02:00:00 ShengHuo ZHU <zsh@cs.rochester.edu> @@ -17157,7 +17157,7 @@ * nnheader.el: Wrap subst-char-in-string def in eval-and-compile. Put some defvars in eval-when-compile. - (gnus-intersection, gnus-sorted-complement): Autoload. + (gnus-intersection, gnus-sorted-complement): Autoload. * imap.el (imap-point-at-eol): New, replacing gnus-point-at-eol. @@ -17329,7 +17329,7 @@ * qp.el (mm-decode-coding-region, mm-encode-coding-region): Autoload. - (quoted-printable-decode-region): Rename arg which confused + (quoted-printable-decode-region): Rename arg which confused charset with coding-system. Don't use nonascii-insert-offset. Coding-system encode the region initially. Don't recognize `==' as valid QP. Coding-system decode the region finally. @@ -17384,7 +17384,7 @@ 2000-09-29 Gerd Moellmann <gerd@gnu.org> - * smiley-ems.el (smiley-update-cache): Use `:ascent center'. + * smiley-ems.el (smiley-update-cache): Use `:ascent center'. 2000-09-21 Dave Love <fx@gnu.org> @@ -18036,7 +18036,7 @@ * gnus-art.el (gnus-mime-display-part): Show MIME security button. (gnus-insert-mime-security-button): New function. * mm-decode.el (mm-possibly-verify-or-decrypt): Add security info. - * mml2015.el: Add security info when verify or decrypt. + * mml2015.el: Add security info when verify or decrypt. * mm-uu.el (mm-uu-pgp-signed-extract): Use multipart. (mm-uu-pgp-encrypted-extract): Ditto. @@ -18433,7 +18433,7 @@ (mm-dissect-multipart): Use it. * mml2015.el (mml2015-fix-micalg): New function. (mml2015-decrypt): Use new interface. - (mml2015-verify): Use new interface. + (mml2015-verify): Use new interface. (mml2015-setup): Make it bogus. 2000-10-28 16:54:45 ShengHuo ZHU <zsh@cs.rochester.edu>
--- a/lisp/gnus/ecomplete.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/gnus/ecomplete.el Thu Oct 14 11:06:31 2010 +0900 @@ -147,7 +147,7 @@ (save-restriction (narrow-to-region (point) (point-at-eol)) (while (not (eobp)) - ;; Put the 'region face on any charactes on this line that + ;; Put the 'region face on any characters on this line that ;; aren't already highlighted. (unless (get-text-property (point) 'face) (put-text-property (point) (1+ (point)) 'face 'highlight))
--- a/lisp/gnus/nnmail.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/gnus/nnmail.el Thu Oct 14 11:06:31 2010 +0900 @@ -225,7 +225,7 @@ In this case, articles containing the string \"boss\" in the To or the From header will be expired to the group \"nnfolder:Work\"; -articles containing the sting \"IMPORTANT\" in the Subject header will +articles containing the string \"IMPORTANT\" in the Subject header will be expired to the group \"nnfolder:IMPORTANT.YYYY.MMM\"; and everything else will be expired to \"nnfolder:Archive-YYYY\"." :version "22.1"
--- a/lisp/international/ccl.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/international/ccl.el Thu Oct 14 11:06:31 2010 +0900 @@ -1437,7 +1437,7 @@ ;; Normal arithmethic operators (same meaning as C code). + | - | * | / | % - ;; Bitwize operators (same meaning as C code) + ;; Bitwise operators (same meaning as C code) | & | `|' | ^ ;; Shifting operators (same meaning as C code)
--- a/lisp/international/fontset.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/international/fontset.el Thu Oct 14 11:06:31 2010 +0900 @@ -700,7 +700,7 @@ ;; "HP-Hebrew8" [36] ;; HPHEBREW8 8-bit character set ;; "HP-Japanese15" [36] -;; HPJAPAN15 15-bit characer set, +;; HPJAPAN15 15-bit character set, ;; modified from industry defacto ;; standard Shift-JIS ;; "HP-Kana8" [36]
--- a/lisp/international/mule.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/international/mule.el Thu Oct 14 11:06:31 2010 +0900 @@ -653,7 +653,7 @@ `write-region-annotate-functions' and `buffer-file-format' are called, and before the text is encoded by the coding system itself. This function should convert the whole text in the -current buffer. For backward compatibility, this funciton is +current buffer. For backward compatibility, this function is passed two arguments which can be ignored. `:default-char'
--- a/lisp/international/titdic-cnv.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/international/titdic-cnv.el Thu Oct 14 11:06:31 2010 +0900 @@ -108,7 +108,7 @@ input method `chinese-qj'.") ("chinese-ecdict" "$(05CKH(B" -"In this input method, you enter a Chinese (Big5) charactere or word +"In this input method, you enter a Chinese (Big5) character or word by typing the corresponding English word. For example, if you type \"computer\", \"$(0IZH+(B\" is input.
--- a/lisp/ls-lisp.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/ls-lisp.el Thu Oct 14 11:06:31 2010 +0900 @@ -621,7 +621,7 @@ ;; They tend to be bogus on non-UNIX platforms anyway so ;; optionally hide them. (if (memq 'uid ls-lisp-verbosity) - ;; uid can be a sting or an integer + ;; uid can be a string or an integer (let ((uid (nth 2 file-attr))) (format (if (stringp uid) ls-lisp-uid-s-fmt
--- a/lisp/mail/emacsbug.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/mail/emacsbug.el Thu Oct 14 11:06:31 2010 +0900 @@ -134,11 +134,11 @@ (overlay-put (make-overlay pos (point)) 'face 'highlight)) (insert " if possible, because the Emacs maintainers usually do not have translators to read other languages for them.\n\n") - (insert (format "Your bug report will be posted to the %s mailing list" + (insert (format "Your report will be posted to the %s mailing list" reporting-address)) ;; Nowadays all bug reports end up there. ;;; (if pretest-p (insert ".\n\n") - (insert ",\nand to the gnu.emacs.bug news group.\n\n")) + (insert "\nand the gnu.emacs.bug news group, and at http://debbugs.gnu.org.\n\n")) (insert "Please describe exactly what actions triggered the bug\n" "and the precise symptoms of the bug. If you can, give\n" @@ -337,5 +337,4 @@ (provide 'emacsbug) -;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49 ;;; emacsbug.el ends here
--- a/lisp/man.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/man.el Thu Oct 14 11:06:31 2010 +0900 @@ -309,7 +309,7 @@ "Regular expression describing references to normal files.") ;; This includes the section as an optional part to catch hyphenated -;; refernces to manpages. +;; references to manpages. (defvar Man-hyphenated-reference-regexp (concat "\\(" Man-name-regexp "\\)\\((\\(" Man-section-regexp "\\))\\)?") "Regular expression describing a reference in the SEE ALSO section.")
--- a/lisp/mh-e/ChangeLog.1 Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/mh-e/ChangeLog.1 Thu Oct 14 11:06:31 2010 +0900 @@ -794,7 +794,7 @@ Merged in 7.4.4 changes, described below. - * mh-e.el (Version, mh-version): Set to 7.4.4+cvs. + * mh-e.el (Version, mh-version): Set to 7.4.4+cvs. 2004-07-10 Bill Wohler <wohler@newt.com> @@ -2197,7 +2197,7 @@ * mh-comp.el (mh-extract-rejected-mail, mh-letter-mode-message): Ditto. - * mh-e.el (mh-refile-a-msg): Ditto. + * mh-e.el (mh-refile-a-msg): Ditto. * mh-funcs.el (mh-undo-folder): Ditto. @@ -2509,7 +2509,7 @@ 2003-07-28 Peter S Galbraith <psg@debian.org> - * mh-comp.el (mh-insert-letter): Remove `mh-visible-headers' + * mh-comp.el (mh-insert-letter): Remove `mh-visible-headers' operation. * mh-mime.el (mh-mm-inline-message): Same. @@ -2697,7 +2697,7 @@ 2003-06-24 Bill Wohler <wohler@newt.com> - * mh-e.el (Version, mh-version): Set to 7.4.1+cvs. + * mh-e.el (Version, mh-version): Set to 7.4.1+cvs. 2003-06-25 Bill Wohler <wohler@newt.com> @@ -2719,7 +2719,7 @@ 2003-06-24 Bill Wohler <wohler@newt.com> - * mh-e.el (Version, mh-version): Set to 7.4+cvs. + * mh-e.el (Version, mh-version): Set to 7.4+cvs. 2003-06-24 Bill Wohler <wohler@newt.com> @@ -4106,7 +4106,7 @@ 2003-04-06 Bill Wohler <wohler@newt.com> - * mh-comp.el (mh-forward): Updated docstrings to indicate that a + * mh-comp.el (mh-forward): Updated docstrings to indicate that a list of messages is acceptable as well. * mh-e.el (mh-delete-msg, mh-delete-msg-no-motion, mh-refile-msg) @@ -4198,7 +4198,7 @@ 2003-04-04 Peter S Galbraith <psg@debian.org> - * mh-e.el (mh-folder-from-address): Minor Fix. Wrong ending of + * mh-e.el (mh-folder-from-address): Minor Fix. Wrong ending of `when' block. 2003-04-04 Satyaki Das <satyaki@theforce.stanford.edu> @@ -7248,7 +7248,7 @@ 2002-11-13 Mark D. Baushke <mdb@gnu.org> - * mh-identity.el (mh-insert-identity): A value of either nil or + * mh-identity.el (mh-insert-identity): A value of either nil or "" should cause the field to be removed. (mh-identity-list): Update the docstring. @@ -7913,7 +7913,7 @@ (mh-folder-font-lock-subject): Adapt to new mh-scan-subject-regexp. * mh-seq.el (mh-subject-to-sequence): Ditto. - * mh-e.el (mh-folder-sequence-menu): Remove "Toggle Subject + * mh-e.el (mh-folder-sequence-menu): Remove "Toggle Subject Thread" from menu. mh-toggle-threads is in the Folder menu. * mh-e.el (mh-folder-sequence-menu): Minor menu text edits. @@ -8252,7 +8252,7 @@ (mh-thread-generate-scan-lines): Renamed dupl-p as dupl-flag. This addresses part of SF #627015. - * mh-index.el (mh-index-advance): Renamed backward-p + * mh-index.el (mh-index-advance): Renamed backward-p local variable as backward-flag. (mh-index-next-button): Renamed backward-p argument as backward-flag. @@ -9220,7 +9220,7 @@ decide how many buttons to use for replying. * mh-mime.el (mh-file-mime-type-substitutions) - (mh-file-mime-type-substitute): Fix typos and doc strings. + (mh-file-mime-type-substitute): Fix typos and doc strings. 2002-09-30 Peter S Galbraith <psg@debian.org> @@ -9325,7 +9325,7 @@ 2002-08-19 Peter S Galbraith <psg@debian.org> * reply-to.xpm, reply-to.pbm, reply-from.xpm, reply-from.pbm, - * reply-all.xpm, reply-all.pbm: New icons for various reply methods. + * reply-all.xpm, reply-all.pbm: New icons for various reply methods. * mh-e.el (mh-folder-tool-bar-map): Split reply button into three that won't prompt for "from", "to" and "all". * mh-comp.el (mh-reply): Put variable reply-to in the interactive @@ -9764,13 +9764,13 @@ to `mh-mml-to-mime' in `mh-send-letter'. (mh-mml-secure-message-sign-pgpmime): New function. Front end to mml-secure-message-sign-pgpmime. - (mh-mml-secure-message-encrypt-pgpmime): New function. + (mh-mml-secure-message-encrypt-pgpmime): New function. Front end to mml-secure-message-encrypt-pgpmime. * mh-comp.el (mh-send-letter): automatic call to `mh-mml-to-mime' if mh-mml-compose-insert-p is set. (mh-letter-mode-map): Add keys for new mh-mime functions above. - * mh-comp.el: Added autoloads for new mh-mime functions above. + * mh-comp.el: Added autoloads for new mh-mime functions above. 2002-06-17 Peter S Galbraith <psg@debian.org> @@ -11010,8 +11010,8 @@ 2001-11-20 Peter S Galbraith <psg@debian.org> * mh-comp.el (mh-letter-mode): Make font-lock-defaults a local variable - * mh-e.el (mh-folder-mode): Same. - * mh-utils.el (mh-show-mode): Same. + * mh-e.el (mh-folder-mode): Same. + * mh-utils.el (mh-show-mode): Same. * mh-e.el (mh-scan-msg-num-regexp): Delete variable and replace with mh-good-msg-regexp.
--- a/lisp/org/ChangeLog Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/org/ChangeLog Thu Oct 14 11:06:31 2010 +0900 @@ -1,3 +1,8 @@ +2010-10-12 Juanma Barranquero <lekktu@gmail.com> + + * org-agenda.el (org-prefix-category-length) + (org-prefix-category-max-length): Fix typos in docstrings. + 2010-05-07 Chong Yidong <cyd@stupidchicken.com> * Version 23.2 released. @@ -5,7 +10,7 @@ 2010-02-15 Chong Yidong <cyd@stupidchicken.com> * org-freemind.el (org-freemind-from-org-mode-node) - (org-freemind-from-org-mode, ) + (org-freemind-from-org-mode) (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode): Pass arg to called-interactively-p.
--- a/lisp/org/org-agenda.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/org/org-agenda.el Thu Oct 14 11:06:31 2010 +0900 @@ -4501,9 +4501,9 @@ "A flag, set by `org-compile-prefix-format'. The flag is set if the currently compiled format contains a `%e'.") (defvar org-prefix-category-length nil - "Used by `org-compile-prefix-format' to remember the category field widh.") + "Used by `org-compile-prefix-format' to remember the category field width.") (defvar org-prefix-category-max-length nil - "Used by `org-compile-prefix-format' to remember the category field widh.") + "Used by `org-compile-prefix-format' to remember the category field width.") (defun org-format-agenda-item (extra txt &optional category tags dotime noprefix remove-re habitp)
--- a/lisp/simple.el Thu Oct 14 11:03:25 2010 +0900 +++ b/lisp/simple.el Thu Oct 14 11:06:31 2010 +0900 @@ -4260,7 +4260,7 @@ (goto-char (next-char-property-change (point)))) ;; Move a line. ;; We don't use `end-of-line', since we want to escape - ;; from field boundaries ocurring exactly at point. + ;; from field boundaries occurring exactly at point. (goto-char (constrain-to-field (let ((inhibit-field-text-motion t)) (line-end-position))
--- a/src/ChangeLog Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ChangeLog Thu Oct 14 11:06:31 2010 +0900 @@ -1,3 +1,19 @@ +2010-10-13 Damyan Pepper <damyanp@gmail.com> + + Fix handling of font properties on Windows (bug#6303). + * font.c (font_filter_properties): New function, refactored from + ftfont_filter_properties. + * font.h (font_filter_properties): Declare. + * ftfont.c (ftfont_filter_properties): Use font_filter_properties. + * w32font.c (w32font_booleans, w32font_non_booleans): New variables. + (w32font_filter_properties): New function. + (w32font_driver): Add w32font_filter_properties. + +2010-10-12 Juanma Barranquero <lekktu@gmail.com> + + * font.c (Ffont_variation_glyphs): + * ccl.c (Fccl_execute_on_string): Fix typo in docstring. + 2010-10-10 Jan Djärv <jan.h.d@swipnet.se> * nsterm.m (Qleft): Declare. @@ -134,7 +150,7 @@ (x_produce_glyphs): Simplify by using the same code for ASCII and non-ASCII characters. Don't set it->char_to_display here. Don't handle unibyte-display-via-language-environment here. For a - charater of no glyph, use font->space_width instead of FONT_WIDTH. + character of no glyph, use font->space_width instead of FONT_WIDTH. 2010-08-29 Kenichi Handa <handa@m17n.org> @@ -171,7 +187,7 @@ * charset.c: Include <stdlib.h> (struct charset_sort_data): New struct. (charset_compare): New function. - (Fsort_charsets): New funciton. + (Fsort_charsets): New function. (syms_of_charset): Declare Fsort_charsets as a Lisp function. * coding.c (decode_coding_iso_2022): Fix checking of dimension @@ -13872,7 +13888,7 @@ (Ffont_shape_text): New function. (Fopen_font): If the font size is not given, use 12-pixel. (Ffont_at): New arg STRING. - (syms_of_font): Initalize font_charset_alist. + (syms_of_font): Initialize font_charset_alist. Declare Ffont_shape_text as a Lisp function. Call syms_of_XXfont conditionally. @@ -14869,7 +14885,7 @@ * font.c (font_unparse_fcname): Fix typo (swidth->width). (font_list_entities): Check driver_list->on. - (register_font_driver): Initalize `on' member to 0. + (register_font_driver): Initialize `on' member to 0. (font_update_drivers): New function. (Fclear_font_cache): Check driver_list->on.
--- a/src/ChangeLog.2 Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ChangeLog.2 Thu Oct 14 11:06:31 2010 +0900 @@ -683,7 +683,7 @@ (That `select' saw something on channel 0 doesn't mean it is kbd input; it could be an expose event.) - * keyboard.c (read_avail_input) [FIONREAD]: Now static. + * keyboard.c (read_avail_input) [FIONREAD]: Now static. New arg specifies value of NREAD; if it is nonzero, don't call get_input_pending to get it. Use kbd_buffer_store_char to put chars into kbd_buffer. @@ -1210,7 +1210,7 @@ Remove #ifndef VMS around the sleep when buffer is full. * s-vms.h: Define nonstandard PENDING_OUTPUT_COUNT for VMS use. - * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp. + * fileio.c (file_name_as_directory) [VMS]: Fix 3rd arg to strncmp. 1987-07-17 Paul Rubin (phr@prep) @@ -1442,7 +1442,7 @@ Turn on call to vmserrstr. * sysdep.c (vmserrstr) [VMS]: Define this function. - * process.c (create_process) [IRIS]: Don't open the pty's tty + * process.c (create_process) [IRIS]: Don't open the pty's tty in the parent process. Open only once, in the child. * xdisp.c (redisplay_window): If window-start points nowhere, @@ -1544,8 +1544,8 @@ 1987-05-05 Richard Mlynarik (mly@prep) - * m-irist.h: New version from raible@orville.arpa - * s-iris3-5.h: New file. (s-usg5-2 with additions) + * m-irist.h: New version from raible@orville.arpa + * s-iris3-5.h: New file. (s-usg5-2 with additions) * keyboard.c: IRIS, like HPUX, #defines but does not implement FIONREAD. @@ -1563,10 +1563,10 @@ 1987-04-27 Richard Mlynarik (mly@prep) * fileio.c (APOLLO from lnz): - Fcopy_file, Fset_file_modes: Don't use un*x modes if + (Fcopy_file, Fset_file_modes): Don't use un*x modes if env var USE_DOMAIN_ACLS is set. - Fset_file_modes: utimes fix. - Finsert_file_contents: Must do fstat after open for Apollo. + (Fset_file_modes): utimes fix. + (Finsert_file_contents): Must do fstat after open for Apollo. * emacs.c (main): (APOLLO from lnz): Don't use un*x modes if env var USE_DOMAIN_ACLS set. @@ -1675,7 +1675,7 @@ 1987-03-20 Richard Mlynarik (mly@prep) - * filemode.c: Hacks for set-uid/gid but not executable. + * filemode.c: Hacks for set-uid/gid but not executable. 1987-03-20 Richard M. Stallman (rms@prep) @@ -1966,7 +1966,7 @@ 1987-02-22 Richard M. Stallman (rms@prep) - * dispnew.c (Fopen_termscript): Close existing termscript + * dispnew.c (Fopen_termscript): Close existing termscript file before trying to open a new one. Report open failure with report_file_error. @@ -2071,9 +2071,9 @@ 1987-02-10 Richard Mlynarik (mly@prep) - * xfns.c (Fx_get_default): Add (unsigned char *) cast. - - * window.c: typo. + * xfns.c (Fx_get_default): Add (unsigned char *) cast. + + * window.c: Typo. 1987-02-09 Richard M. Stallman (rms@prep) @@ -2853,7 +2853,7 @@ local variables for more register decls. Compute and pass `envlen' arg to child_setup. - * process.c (create_process): Compute and pass `envlen' arg + * process.c (create_process): Compute and pass `envlen' arg to child_setup. * xterm.c (x_term_init): Don't call XPopUpWindow at all. @@ -3998,7 +3998,7 @@ * editfns.c (Fuser_uid, Fuser_real_uid): New functions that return values of geteuid and getuid system calls. - * dired.c (Ffile_attributes): Value has additional element + * dired.c (Ffile_attributes): Value has additional element t iff file gid would change if Emacs deletes it and recreates it. * xdisp.c (display_mode_element): @@ -4078,7 +4078,7 @@ being unbound. struct catchtag has two new fields, gcpro and pdlcount. - * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp. + * eval.c (Fthrow, Fsignal): Use unbind_catch before longjmp. * eval.c (internal_catch): No need to restore anything from the catchtag after throw, because unbind_catch does it all. @@ -4657,7 +4657,7 @@ * fileio.c (Ffile_newer_than_file_p): New Lisp primitive. - * fileio.c (Ffile_exists_p): this is now distinct from + * fileio.c (Ffile_exists_p): This is now distinct from Ffile_readable_p; it checks only for existence, not for readability.
--- a/src/ChangeLog.3 Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ChangeLog.3 Thu Oct 14 11:06:31 2010 +0900 @@ -5146,7 +5146,7 @@ Change mouse movement events to be arranged like click events. (format_modifiers): Note that the click modifier has no written representation. - (modifier_names, modifer_symbols): New variables, used to + (modifier_names, modifier_symbols): New variables, used to create the Qevent_symbol_elements property. (modify_event_symbol): Change the format of the modified symbol cache; there are too many modifier bits now to use a @@ -5154,8 +5154,8 @@ Document the format of the cache. Put the Qevent_symbol_elements property on each new symbol, instead of a Qevent_unmodified property. - (symbols_of_keyboard): Put Qevent_symbol_elements properties on - the symbols specified in head_table, not Qevent_unmodifed properties. + (symbols_of_keyboard): Put Qevent_symbol_elements properties on the + symbols specified in head_table, not Qevent_unmodified properties. Initialize and staticpro modifier_symbols, and staticpro the window elements of button_down_location. @@ -11207,7 +11207,7 @@ events to send the function key number instead of a symbol. * keyboard.c (modify_event_symbol): Re-arranged to work well with function key/mouse button numbers instead of symbols. - And if (MODIFIERS & up_modifer), prepend "U-" to the name of the + And if (MODIFIERS & up_modifier), prepend "U-" to the name of the symbol being constructed. (make_lispy_event): Use the new modify_event_symbol.
--- a/src/ChangeLog.5 Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ChangeLog.5 Thu Oct 14 11:06:31 2010 +0900 @@ -3107,7 +3107,7 @@ * lisp.h (enum Lisp_Type): Lisp_Process, Lisp_Window, Lisp_Frame, Lisp_Subr deleted. - (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting. + (PSEUDOVECTORP, GC_PSEUDOVECTORP): Add paren for proper nesting. (PROCESSP, GC_PROCESSP, XSETPROCESS): Rewrite to use pseudovectors. (WINDOWP, GC_WINDOWP, XSETWINDOW): Likewise. (FRAMEP, GC_FRAMEP): Likewise. @@ -4093,7 +4093,7 @@ * xterm.h: Delete X10 code. - * xfns.c (Fx_create_frame): Don't increment refernce_count + * xfns.c (Fx_create_frame): Don't increment reference_count until the frame is put on the frame list. * xterm.c (x_initialize): Init x_noop_count, x_focus_frame @@ -7039,7 +7039,7 @@ 1994-06-07 Richard Stallman (rms@mole.gnu.ai.mit.edu) - * mips-siemens.h: Include pyramid.h, not mips.h. + * mips-siemens.h: Include pyramid.h, not mips.h. (LOAD_AVE_TYPE, LOAD_AVE_CVT): Definitions deleted. (NO_ARG_ARRAY, HAVE_ALLOCA): Defined. (BROKEN_FIONREAD): Add #undef.
--- a/src/ChangeLog.7 Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ChangeLog.7 Thu Oct 14 11:06:31 2010 +0900 @@ -491,7 +491,7 @@ * xselect.c (selection_data_to_lisp_data): Set Vlast_coding_system_used. - (lisp_data_to_selection_data): Likewize. + (lisp_data_to_selection_data): Likesize. 1998-07-07 Richard Stallman <rms@psilocin.ai.mit.edu> @@ -502,7 +502,7 @@ * editfns.c (Fformat): Replace explicit numeric constants with proper macros. - * fns.c (concat): Likewize. + * fns.c (concat): Likewise. 1998-07-06 Kenichi Handa <handa@etl.go.jp> @@ -1040,7 +1040,7 @@ * lread.c: Remember the last TWO strings skipped with #@. (prev_saved_doc_string*): New variables. - (Fload): Initalize prev_saved_doc_string. + (Fload): Initialize prev_saved_doc_string. (read1): Copy saved_doc_string to prev_saved_doc_string before storing a new string in saved_doc_string. (read_list): Look in prev_saved_doc_string as well as
--- a/src/ChangeLog.8 Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ChangeLog.8 Thu Oct 14 11:06:31 2010 +0900 @@ -3686,7 +3686,7 @@ * lread.c (read_escape): For Control modifier, pay attention to multibyte character. (read1): Likewise. Signal error or a multibyte character which - has a modifer bit. Check validity of Shift modifer. + has a modifier bit. Check validity of Shift modifier. * charset.c (non_ascii_char_to_string): Handle modifier bits as the same as Lisp reader.
--- a/src/ChangeLog.9 Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ChangeLog.9 Thu Oct 14 11:06:31 2010 +0900 @@ -3896,7 +3896,7 @@ 2001-01-07 Dave Love <fx@gnu.org> - * keyboard.c (Fread_key_sequence_vector): Avoid newline in + * keyboard.c (Fread_key_sequence_vector): Avoid newline in arglist, for documentation's sake. 2001-01-06 Andrew Innes <andrewi@gnu.org> @@ -4180,7 +4180,7 @@ what's displayed in the window. * xdisp.c (try_window_reusing_current_matrix) - <new start <= old start>: Disable rows in the current matrix + <new start <= old start>: Disable rows in the current matrix which are below the window after scrolling. * xdisp.c (move_it_by_lines): Don't do optimizations if NEED_Y_P @@ -5480,7 +5480,7 @@ * lisp.h (pos_visible_p): Change prototype. * dispextern.h (CURRENT_MODE_LINE_HEIGHT) - (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height + (CURRENT_HEADER_LINE_HEIGHT): Look at current_mode_line_height and current_header_line_height first. (current_mode_line_height, current_header_line_height): Declare extern. @@ -6683,7 +6683,7 @@ (create_offscreen_bitmap): New function. (w32_BDF_TextOut): Use it. Draw glyphs as DIBs. - * w32term.c (x_produce_glyphs): If the distance from the current + * w32term.c (x_produce_glyphs): If the distance from the current position to the next tab stop is less than a canonical character width, use the tab stop after that. (x_draw_glyphs): Handle case START and END are out of bounds more @@ -7536,7 +7536,7 @@ CYCLE_CHECK arguments. (merge_face_vector_with_property, Finternal_merge_in_global_face) (lookup_named_face, lookup_derived_face, realize_named_face) - (face_at_string_position, face_at_buffer_position): Supply + (face_at_string_position, face_at_buffer_position): Supply new F and CYCLE_CHECK arguments to merge_face_vectors. (merge_face_heights): New function. (merge_face_vectors, merge_face_vector_with_property) @@ -7826,7 +7826,7 @@ (x_compute_glyph_string_overhangs): Incomplete body removed, as the X way of doing this will not work for W32. (w32_intersect_rectangles): Removed. Use IntersectRect API call. - (x_draw_image_foreground): Avoid drawing outside of the clip area + (x_draw_image_foreground): Avoid drawing outside of the clip area when image doesn't have a mask. (note_mouse_highlight): Process overlays in the right order of priority. Set help_echo_window. @@ -10156,7 +10156,7 @@ (encode_coding_string): Likewise. * ccl.c (ccl_driver) <CCL_ReadMultibyteChar2> - <CCL_WriteMultibyteChar2>: Handle charsets eight-bit-control and + <CCL_WriteMultibyteChar2>: Handle charsets eight-bit-control and eight-bit-graphic correctly. 2000-05-24 Kenichi HANDA <handa@etl.go.jp> @@ -12812,7 +12812,7 @@ (xim_destroy_callback, xim_open_dpy, xim_instantiate_callback) (xim_initialize, xim_close) [HAVE_X_I18N && HAVE_X11R6]: New functions. - (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame. + (x_destroy_window) [HAVE_X_I18N]: Call xic_destroy_frame. (x_term_init) [HAVE_X_I18N]: Call xim_initialize. (x_delete_display) [HAVE_X_I18N]: Call xim_close.
--- a/src/ccl.c Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ccl.c Thu Oct 14 11:06:31 2010 +0900 @@ -450,7 +450,7 @@ Therefore, the instruction code range is 0..16384(0x3fff). */ -/* Read a multibyte characeter. +/* Read a multibyte character. A code point is stored into reg[rrr]. A charset ID is stored into reg[RRR]. */ @@ -2058,7 +2058,7 @@ If IC is nil, it is initialized to head of the CCL program. If optional 4th arg CONTINUE is non-nil, keep IC on read operation -when read buffer is exausted, else, IC is always set to the end of +when read buffer is exhausted, else, IC is always set to the end of CCL-PROGRAM on exit. It returns the contents of write buffer as a string,
--- a/src/dispextern.h Thu Oct 14 11:03:25 2010 +0900 +++ b/src/dispextern.h Thu Oct 14 11:06:31 2010 +0900 @@ -1873,7 +1873,7 @@ are not iterating over a composition now. */ int id; /* If non-negative, character that triggers the automatic - composition at `stop_pos', and this is an automatic compositoin. + composition at `stop_pos', and this is an automatic composition. If negative, this is a static composition. This is set to -2 temporarily if searching of composition reach a limit or a newline. */
--- a/src/font.c Thu Oct 14 11:03:25 2010 +0900 +++ b/src/font.c Thu Oct 14 11:06:31 2010 +0900 @@ -3862,6 +3862,59 @@ } +/* Sets attributes on a font. Any properties that appear in ALIST and + BOOLEAN_PROPERTIES or NON_BOOLEAN_PROPERTIES are set on the font. + BOOLEAN_PROPERTIES and NON_BOOLEAN_PROPERTIES are NULL-terminated + arrays of strings. This function is intended for use by the font + drivers to implement their specific font_filter_properties. */ +void +font_filter_properties (font, alist, boolean_properties, non_boolean_properties) + Lisp_Object font; + Lisp_Object alist; + const char *boolean_properties[]; + const char *non_boolean_properties[]; +{ + Lisp_Object it; + int i; + + /* Set boolean values to Qt or Qnil */ + for (i = 0; boolean_properties[i] != NULL; ++i) + for (it = alist; ! NILP (it); it = XCDR (it)) + { + Lisp_Object key = XCAR (XCAR (it)); + Lisp_Object val = XCDR (XCAR (it)); + char *keystr = SDATA (SYMBOL_NAME (key)); + + if (strcmp (boolean_properties[i], keystr) == 0) + { + const char *str = INTEGERP (val) ? (XINT (val) ? "true" : "false") + : SYMBOLP (val) ? (const char *) SDATA (SYMBOL_NAME (val)) + : "true"; + + if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0 + || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0 + || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0 + || strcmp ("Off", str) == 0) + val = Qnil; + else + val = Qt; + + Ffont_put (font, key, val); + } + } + + for (i = 0; non_boolean_properties[i] != NULL; ++i) + for (it = alist; ! NILP (it); it = XCDR (it)) + { + Lisp_Object key = XCAR (XCAR (it)); + Lisp_Object val = XCDR (XCAR (it)); + char *keystr = SDATA (SYMBOL_NAME (key)); + if (strcmp (non_boolean_properties[i], keystr) == 0) + Ffont_put (font, key, val); + } +} + + /* Return the font used to draw character C by FACE at buffer position POS in window W. If STRING is non-nil, it is a string containing C at index POS. If C is negative, get C from the current buffer or @@ -4634,7 +4687,7 @@ doc: /* Return a list of variation glyphs for CHAR in FONT-OBJECT. Each element of the value is a cons (VARIATION-SELECTOR . GLYPH-ID), where - VARIATION-SELECTOR is a chracter code of variation selection + VARIATION-SELECTOR is a character code of variation selection (#xFE00..#xFE0F or #xE0100..#xE01EF) GLYPH-ID is a glyph code of the corresponding variation glyph. */) (font_object, character)
--- a/src/font.h Thu Oct 14 11:03:25 2010 +0900 +++ b/src/font.h Thu Oct 14 11:06:31 2010 +0900 @@ -574,7 +574,7 @@ FONT-ENTITY and it must be opened to check it, return -1. */ int (*has_char) P_ ((Lisp_Object font, int c)); - /* Return a glyph code of FONT for characer C (Unicode code point). + /* Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ unsigned (*encode_char) P_ ((struct font *font, int c)); @@ -814,6 +814,11 @@ extern void *font_get_frame_data P_ ((FRAME_PTR f, struct font_driver *driver)); +extern void font_filter_properties (Lisp_Object font, + Lisp_Object alist, + const char *boolean_properties[], + const char *non_boolean_properties[]); + #ifdef HAVE_FREETYPE extern struct font_driver ftfont_driver; #endif /* HAVE_FREETYPE */
--- a/src/frame.h Thu Oct 14 11:03:25 2010 +0900 +++ b/src/frame.h Thu Oct 14 11:06:31 2010 +0900 @@ -306,7 +306,7 @@ /* Canonical X unit. Width of default font, in pixels. */ int column_width; - /* Widht of space glyph of default font, in pixels. */ + /* Width of space glyph of default font, in pixels. */ int space_width; /* Canonical Y unit. Height of a line, in pixels. */
--- a/src/ftfont.c Thu Oct 14 11:03:25 2010 +0900 +++ b/src/ftfont.c Thu Oct 14 11:06:31 2010 +0900 @@ -88,7 +88,7 @@ enum ftfont_cache_for)); static void ftfont_filter_properties P_ ((Lisp_Object font, Lisp_Object alist)); - + Lisp_Object ftfont_font_format P_ ((FcPattern *, Lisp_Object)); #define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM)) @@ -264,7 +264,7 @@ else { /* As this font is not scalable, parhaps this is a BDF or PCF - font. */ + font. */ FT_Face ft_face; ASET (entity, FONT_ADSTYLE_INDEX, get_adstyle_property (p)); @@ -2113,7 +2113,7 @@ return to; } -static int +static int ftfont_try_otf (MFLTFont *font, MFLTOtfSpec *spec, MFLTGlyphString *in, int from, int to) { @@ -2681,42 +2681,7 @@ Lisp_Object font; Lisp_Object alist; { - Lisp_Object it; - int i; - - /* Set boolean values to Qt or Qnil */ - for (i = 0; ftfont_booleans[i] != NULL; ++i) - for (it = alist; ! NILP (it); it = XCDR (it)) - { - Lisp_Object key = XCAR (XCAR (it)); - Lisp_Object val = XCDR (XCAR (it)); - char *keystr = SDATA (SYMBOL_NAME (key)); - - if (strcmp (ftfont_booleans[i], keystr) == 0) - { - char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL; - if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false"; - if (str == NULL) str = "true"; - - val = Qt; - if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0 - || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0 - || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0 - || strcmp ("Off", str) == 0) - val = Qnil; - Ffont_put (font, key, val); - } - } - - for (i = 0; ftfont_non_booleans[i] != NULL; ++i) - for (it = alist; ! NILP (it); it = XCDR (it)) - { - Lisp_Object key = XCAR (XCAR (it)); - Lisp_Object val = XCDR (XCAR (it)); - char *keystr = SDATA (SYMBOL_NAME (key)); - if (strcmp (ftfont_non_booleans[i], keystr) == 0) - Ffont_put (font, key, val); - } + font_filter_properties (font, alist, ftfont_booleans, ftfont_non_booleans); }
--- a/src/nsterm.m Thu Oct 14 11:03:25 2010 +0900 +++ b/src/nsterm.m Thu Oct 14 11:06:31 2010 +0900 @@ -145,24 +145,24 @@ extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft; /* Specifies which emacs modifier should be generated when NS receives - the Alternate modifer. May be Qnone or any of the modifier lisp symbols. */ + the Alternate modifier. May be Qnone or any of the modifier lisp symbols. */ Lisp_Object ns_alternate_modifier; /* Specifies which emacs modifier should be generated when NS receives - the right Alternate modifer. Has same values as ns_alternate_modifier plus + the right Alternate modifier. Has same values as ns_alternate_modifier plus the value Qleft which means whatever value ns_alternate_modifier has. */ Lisp_Object ns_right_alternate_modifier; /* Specifies which emacs modifier should be generated when NS receives - the Command modifer. May be any of the modifier lisp symbols. */ + the Command modifier. May be any of the modifier lisp symbols. */ Lisp_Object ns_command_modifier; /* Specifies which emacs modifier should be generated when NS receives - the Control modifer. May be any of the modifier lisp symbols. */ + the Control modifier. May be any of the modifier lisp symbols. */ Lisp_Object ns_control_modifier; /* Specifies which emacs modifier should be generated when NS receives - the Function modifer (laptops). May be any of the modifier lisp symbols. */ + the Function modifier (laptops). May be any of the modifier lisp symbols. */ Lisp_Object ns_function_modifier; /* Control via default 'GSFontAntiAlias' on OS X and GNUstep. */
--- a/src/print.c Thu Oct 14 11:03:25 2010 +0900 +++ b/src/print.c Thu Oct 14 11:06:31 2010 +0900 @@ -1450,7 +1450,7 @@ #define PRINT_STRING_NON_CHARSET_FOUND 1 #define PRINT_STRING_UNSAFE_CHARSET_FOUND 2 -/* Bitwize or of the abobe macros. */ +/* Bitwise or of the above macros. */ static int print_check_string_result; static void
--- a/src/regex.c Thu Oct 14 11:03:25 2010 +0900 +++ b/src/regex.c Thu Oct 14 11:06:31 2010 +0900 @@ -4145,7 +4145,7 @@ && match_any_multibyte_characters == false) { /* Set fastmap[I] to 1 where I is a leading code of each - multibyte characer in the range table. */ + multibyte character in the range table. */ int c, count; unsigned char lc1, lc2;
--- a/src/w32font.c Thu Oct 14 11:03:25 2010 +0900 +++ b/src/w32font.c Thu Oct 14 11:06:31 2010 +0900 @@ -346,7 +346,7 @@ } /* w32 implementation of encode_char for font backend. - Return a glyph code of FONT for characer C (Unicode code point). + Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. For speed, the gdi backend uses unicode (Emacs calls encode_char @@ -2446,6 +2446,25 @@ return DECODE_SYSTEM (build_string (buf)); } +static const char *w32font_booleans [] = { + NULL, +}; + +static const char *w32font_non_booleans [] = { + ":script", + ":antialias", + ":style", + NULL, +}; + +static void +w32font_filter_properties (font, alist) + Lisp_Object font; + Lisp_Object alist; +{ + font_filter_properties (font, alist, w32font_booleans, w32font_non_booleans); +} + struct font_driver w32font_driver = { 0, /* Qgdi */ @@ -2475,7 +2494,7 @@ NULL, /* shape */ NULL, /* check */ NULL, /* get_variation_glyphs */ - NULL, /* filter_properties */ + w32font_filter_properties, };
--- a/src/w32uniscribe.c Thu Oct 14 11:03:25 2010 +0900 +++ b/src/w32uniscribe.c Thu Oct 14 11:06:31 2010 +0900 @@ -448,7 +448,7 @@ } /* Uniscribe implementation of encode_char for font backend. - Return a glyph code of FONT for characer C (Unicode code point). + Return a glyph code of FONT for character C (Unicode code point). If FONT doesn't have such a glyph, return FONT_INVALID_CODE. */ static unsigned uniscribe_encode_char (font, c)