Merge changes from emacs-23 branch.
This commit is contained in:
Juanma Barranquero
commit
220d91b834
50 changed files with 310 additions and 246 deletions
31
BUGS
31
BUGS
|
|
@ -1,26 +1,23 @@
|
|||
If you think you may have found a bug in GNU Emacs, please
|
||||
read the Bugs section of the Emacs manual for advice on
|
||||
If you think you may have found a bug in GNU Emacs, please read the
|
||||
Bugs section of the Emacs manual for advice on
|
||||
|
||||
(1) how to tell when to report a bug, and
|
||||
(2) how to write a useful bug report and what information
|
||||
it needs to have.
|
||||
(2) how to write a useful bug report and what information it needs to have.
|
||||
|
||||
There are three ways to read the Bugs section.
|
||||
You can read the read the Bugs section of the manual from inside Emacs.
|
||||
Start Emacs, do C-h i to enter Info, then m Emacs RET to get to the
|
||||
Emacs manual, then m Bugs RET to get to the section on bugs.
|
||||
Or you can use the standalone Info program in a like manner.
|
||||
(Standalone Info is part of the Texinfo distribution, not part of the
|
||||
Emacs distribution.)
|
||||
|
||||
(1) In a printed copy of the Emacs manual.
|
||||
You can order one from the Free Software Foundation;
|
||||
see the file etc/ORDERS. But if you don't have a copy on
|
||||
hand and you think you have found a bug, you shouldn't wait
|
||||
to get a printed manual; you should read the section right away
|
||||
as described below.
|
||||
Printed copies of the Emacs manual can be purchased from the Free
|
||||
Software Foundation's online store at <http://shop.fsf.org/>.
|
||||
|
||||
(2) With Info. Start Emacs, do C-h i to enter Info,
|
||||
then m Emacs RET to get to the Emacs manual, then m Bugs RET
|
||||
to get to the section on bugs. Or use standalone Info in
|
||||
a like manner. (Standalone Info is part of the Texinfo distribution,
|
||||
not part of the Emacs distribution.)
|
||||
If necessary, you can read the manual without an info program:
|
||||
|
||||
(3) By hand. Do
|
||||
cat info/emacs* | more "+/^File: emacs, Node: Bugs,"
|
||||
|
||||
|
||||
Please first check the file etc/PROBLEMS (e.g. with C-h C-p in Emacs) to
|
||||
make sure it isn't a known issue.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2010-10-14 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* BUGS, INSTALL.BZR, README: Updates.
|
||||
|
||||
2010-10-13 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* make-dist: Remove --compress. Check for the appropriate
|
||||
|
|
|
|||
14
INSTALL.BZR
14
INSTALL.BZR
|
|
@ -31,13 +31,9 @@ generated files, such as esh-groups.el, and *-loaddefs.el in some
|
|||
subdirectories of lisp/, e.g. mh-e/ and calendar/) will need to be
|
||||
updated to reflect new autoloaded functions. If you see errors (rather
|
||||
than warnings) about undefined lisp functions during compilation, that
|
||||
may be the reason. Another symptom may be an error saying that
|
||||
"loaddefs.el" could not be found; this is due to a change in the way
|
||||
loaddefs.el was handled in version control, and should only happen
|
||||
once, for users that are updating old sources. Finally, sometimes
|
||||
there can be build failures related to *loaddefs.el (e.g. "required
|
||||
feature `esh-groups' was not provided"). In that case, follow the
|
||||
instructions below.
|
||||
may be the reason. Finally, sometimes there can be build failures
|
||||
related to *loaddefs.el (e.g. "required feature `esh-groups' was not
|
||||
provided"). In that case, follow the instructions below.
|
||||
|
||||
To update loaddefs.el (and similar files), do:
|
||||
|
||||
|
|
@ -53,10 +49,6 @@ platform-specific configuration scripts (nt/configure.bat, config.bat,
|
|||
etc.) before "make bootstrap" or "make"; the rest of the procedure is
|
||||
applicable to those systems as well.
|
||||
|
||||
Questions, requests, and bug reports about the Bazaar versions of Emacs
|
||||
should be sent to bug-gnu-emacs@gnu.org rather than gnu.emacs.help.
|
||||
Ideally, use M-x report-emacs-bug RET.
|
||||
|
||||
Because the Bazaar version of Emacs is a work in progress, it will
|
||||
sometimes fail to build. Please wait a day or so (and check the bug
|
||||
and development mailing list archives) before reporting such problems.
|
||||
|
|
|
|||
18
README
18
README
|
|
@ -65,16 +65,15 @@ There are several subdirectories:
|
|||
which can't be directly produced by your keyboard.
|
||||
`lib-src' holds the source code for some utility programs for use by or
|
||||
with Emacs, like movemail and etags.
|
||||
`etc' holds miscellaneous architecture-independent data files
|
||||
Emacs uses, like the tutorial text and the Zippy the Pinhead
|
||||
quote database. The contents of the `lisp', `leim', `info',
|
||||
`man', `lispref', and `lispintro' subdirectories are
|
||||
architecture-independent too.
|
||||
`etc' holds miscellaneous architecture-independent data files Emacs
|
||||
uses, like the tutorial text and tool bar images.
|
||||
The contents of the `lisp', `leim', `info', and `doc'
|
||||
subdirectories are architecture-independent too.
|
||||
`info' holds the Info documentation tree for Emacs.
|
||||
`doc/emacs' holds the source code for the Emacs Manual. If you modify the
|
||||
manual sources, you will need the `makeinfo' program to produce
|
||||
an updated manual. `makeinfo' is part of the GNU Texinfo
|
||||
package; you need version 4.6 or later of Texinfo.
|
||||
package; you need a suitably recent version of Texinfo.
|
||||
`doc/lispref' holds the source code for the Emacs Lisp reference manual.
|
||||
`doc/lispintro' holds the source code for the Introduction to Programming
|
||||
in Emacs Lisp manual.
|
||||
|
|
@ -85,10 +84,9 @@ There are several subdirectories:
|
|||
to building and running Emacs on Windows 9X/ME/NT/2000/XP.
|
||||
`test' holds tests for various aspects of Emacs's functionality.
|
||||
|
||||
Building Emacs on non-Posix platforms requires to install tools
|
||||
that aren't part of the standard distribution of the OS. The
|
||||
platform-specific README files and installation instructions should
|
||||
list the required tools.
|
||||
Building Emacs on non-Posix platforms requires tools that aren't part
|
||||
of the standard distribution of the OS. The platform-specific README
|
||||
files and installation instructions should list the required tools.
|
||||
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2010-10-14 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* tutorials/TUTORIAL.es: Fix typos.
|
||||
|
||||
2010-10-13 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* NEWS: Mention `dynamic-library-alist'.
|
||||
|
|
|
|||
|
|
@ -34,6 +34,11 @@ alt/option key by customizing the value for ns-right-alternate-modifier.
|
|||
** The appt-add command takes an optional argument for the warning time.
|
||||
This can be used in place of the default appt-message-warning-time.
|
||||
|
||||
** Obsolete packages
|
||||
|
||||
+++
|
||||
*** lmenu.el and cl-compat.el are now obsolete.
|
||||
|
||||
|
||||
* New Modes and Packages in Emacs 23.3
|
||||
|
||||
|
|
|
|||
|
|
@ -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 @@ Nota importante: para terminar la sesi
|
|||
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 @@ equivalentes a las cuatro teclas de flechas, de esta manera:
|
|||
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 @@ manera de pasarle un factor de repetici
|
|||
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 @@ Puede borrar el
|
|||
<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 @@ otro extremo de esa parte, y teclee C-w. Eso elimina todo el texto
|
|||
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 @@ puede ser reinsertado, mientras que las cosas "borradas" no pueden ser
|
|||
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 @@ Note que al teclear C-k una sola vez elimina el contenido de la l
|
|||
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 @@ eliminaci
|
|||
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 @@ adicional.
|
|||
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 @@ si puede pegarlo con C-y; no hay diferencia alguna para deshacer.
|
|||
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 @@ teclee el comando
|
|||
|
||||
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 almacena cada texto del archivo dentro de un objeto llamado
|
|||
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 @@ momento. Ese buffer es el que actualmente edita. Si quiere editar
|
|||
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 @@ dentro de Emacs en ese buffer del archivo. La creaci
|
|||
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 @@ guardada. Le pregunta, por cada buffer, si quiere guardarlo o no.
|
|||
|
||||
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 @@ El comando replace-string requiere dos argumentos: la cadena de
|
|||
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 @@ que est
|
|||
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 @@ parte de la l
|
|||
|
||||
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 @@ Decimos que el comando "cambia el modo".
|
|||
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 @@ Un comando similar, C-h v, muestra la documentaci
|
|||
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 @@ correspondientes tales como find-file.
|
|||
---------------------
|
||||
|
||||
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 @@ llamado "Completation".
|
|||
|
||||
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 @@ Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
|
|||
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.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,23 @@
|
|||
2010-10-14 Kenichi Handa <handa@m17n.org>
|
||||
|
||||
* mail/rmail.el (rmail-show-message-1): Catch an error of
|
||||
base64-decode-region and just show an error message (bug#7165).
|
||||
|
||||
* ps-mule.el (ps-mule-font-spec-list): Delete it. Not used
|
||||
anymore.
|
||||
(ps-mule-begin-job): Fix for the case that only ENCODING is set in
|
||||
a font-spec (bug#7197).
|
||||
|
||||
2010-10-14 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* mail/emacsbug.el (report-emacs-bug): Mention debbugs.gnu.org.
|
||||
|
||||
2010-10-14 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-14 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* cus-face.el (custom-theme-set-faces): Call custom-push-theme
|
||||
|
|
|
|||
|
|
@ -574,7 +574,7 @@
|
|||
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -16925,7 +16925,7 @@
|
|||
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.
|
||||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ Do this by extracting the lowest directory name."
|
|||
;; 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 associations.
|
||||
;; between the files based on their associations.
|
||||
;;
|
||||
(defun ede-header-file ()
|
||||
"Return the header file for the current buffer.
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ of the text in the region.
|
|||
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -384,7 +384,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*))
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2010-10-14 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring.
|
||||
|
||||
2010-10-10 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
* erc-list.el (erc-list-menu-mode-map): Declare and define in one step.
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ Your friends should issue \"/ctcp yournick XDCC list\" to see this."
|
|||
(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))))
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -1437,7 +1437,7 @@ OPERATOR :=
|
|||
;; 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)
|
||||
|
|
|
|||
|
|
@ -700,7 +700,7 @@ Internal use only. Should be called at startup time."
|
|||
;; "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]
|
||||
|
|
|
|||
|
|
@ -646,7 +646,7 @@ VALUE must be a function to call after all functions in
|
|||
`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'
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ For double-width GB2312 characters correponding to ASCII, use the
|
|||
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.
|
||||
|
||||
|
|
|
|||
|
|
@ -637,7 +637,7 @@ SWITCHES, TIME-INDEX and NOW give the full switch list and time data."
|
|||
;; 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
|
||||
|
|
|
|||
|
|
@ -173,9 +173,9 @@ Prompts for bug subject. Leaves you in a mail buffer."
|
|||
(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"
|
||||
report-emacs-bug-address))
|
||||
(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"
|
||||
|
|
@ -377,5 +377,4 @@ and send the mail again%s."
|
|||
|
||||
(provide 'emacsbug)
|
||||
|
||||
;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
|
||||
;;; emacsbug.el ends here
|
||||
|
|
|
|||
|
|
@ -2742,7 +2742,9 @@ The current mail message becomes the message displayed."
|
|||
nil t 'unibyte)
|
||||
(message "Malformed MIME quoted-printable message")))
|
||||
((and (string= character-coding "base64") is-text-message)
|
||||
(base64-decode-region (point-min) (point-max)))
|
||||
(condition-case err
|
||||
(base64-decode-region (point-min) (point-max))
|
||||
(error (message "%s" (cdr err)))))
|
||||
((eq character-coding 'uuencode)
|
||||
(error "uuencoded messages are not supported yet"))
|
||||
(t))
|
||||
|
|
|
|||
|
|
@ -320,31 +320,19 @@ by `ps-font-family' and `ps-header-font-family'.
|
|||
|
||||
See also `ps-mule-font-info-database-bdf'.")
|
||||
|
||||
(defvar ps-mule-font-spec-list nil
|
||||
"Array of FONT-SPEC lists for each font type.
|
||||
|
||||
Elements are for `normal' font, `bold' font, `italic' font, and
|
||||
`bold-italic' font in this order.
|
||||
|
||||
Each element is a list of FONT-SPEC which has this form:
|
||||
|
||||
(ID CHARSET (FONT-SRC FONT-NAME ENCODING) EXTRA-DATA)
|
||||
|
||||
Where
|
||||
|
||||
ID is a number for this FONT-SPEC and is unique in the list.
|
||||
|
||||
CHARSET, FONT-SRC, FONT-NAME, ENCODING are the same as those in
|
||||
`ps-mule-font-info-database' (which see).
|
||||
|
||||
EXTRA-DATA is a data attached by external libraries.
|
||||
|
||||
Each list is ordered by the current charset priorities.
|
||||
|
||||
This variable is setup by `ps-mule-begin-job' from
|
||||
`ps-mule-font-info-database'.")
|
||||
|
||||
;; Functions to access each element of FONT-SPEC.
|
||||
;;
|
||||
;; FONT-SPEC is a vector of this form:
|
||||
;; [ID CHARSET FONT-ID FONT-SRC FONT-NAME ENCODING BYTES EXTRA-DATA]
|
||||
;; Where
|
||||
;;
|
||||
;; ID is an identification number for this FONT-SPEC and is unique in the list.
|
||||
;;
|
||||
;; CHARSET, FONT-SRC, FONT-NAME, ENCODING, and BYTES are the same as those in
|
||||
;; `ps-mule-font-info-database' (which see).
|
||||
;;
|
||||
;; EXTRA-DATA is a data attached by external libraries.
|
||||
|
||||
(defsubst ps-mule-font-spec-id (font-spec) (aref font-spec 0))
|
||||
(defsubst ps-mule-font-spec-charset (font-spec) (aref font-spec 1))
|
||||
(defsubst ps-mule-font-spec-font-id (font-spec) (aref font-spec 2))
|
||||
|
|
@ -1044,7 +1032,7 @@ It checks if all multi-byte characters in the region are printable or not."
|
|||
(if (and (not (find-composition from to))
|
||||
(save-excursion
|
||||
(goto-char from)
|
||||
(= (skip-chars-forward "\x00-\xFF" to) to)))
|
||||
(= (skip-chars-forward "\x00-\x7F" to) to)))
|
||||
;; All characters can be printed by normal PostScript fonts.
|
||||
(setq ps-basic-plot-string-function 'ps-basic-plot-string
|
||||
ps-encode-header-string-function 'identity)
|
||||
|
|
@ -1086,17 +1074,19 @@ It checks if all multi-byte characters in the region are printable or not."
|
|||
(setq font-info-list (cons font-info font-info-list))))
|
||||
(setq font-info-list (nreverse font-info-list)))
|
||||
|
||||
;; Now font-info-list is an alist ordered by charset priority.
|
||||
;; Store FONT-SPECs in each element of font-spec-alist.
|
||||
(dolist (font-info font-info-list)
|
||||
(let ((font-spec-vec (make-vector 4 nil))
|
||||
(charset (car font-info))
|
||||
encoding font-spec)
|
||||
encoding bytes font-spec)
|
||||
(dolist (e (cdr font-info))
|
||||
(setq encoding (or (nth 3 e) charset)
|
||||
font-spec (vector id-max charset font-id
|
||||
(setq encoding (nth 3 e) bytes (nth 4 e))
|
||||
(unless encoding
|
||||
(setq encoding charset bytes (charset-dimension charset)))
|
||||
(setq font-spec (vector id-max charset font-id
|
||||
(nth 1 e) (nth 2 e) encoding
|
||||
(or (nth 4 e) (charset-dimension encoding))
|
||||
nil)
|
||||
(or bytes 1) nil)
|
||||
id-max (1+ id-max))
|
||||
(if (ps-mule-check-font font-spec)
|
||||
(aset font-spec-vec
|
||||
|
|
|
|||
|
|
@ -6656,7 +6656,7 @@ If FACE is not a valid face name, use default face."
|
|||
;; But autoload them here to make the separation invisible.
|
||||
|
||||
;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
|
||||
;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "d2fcad95db7404989362657faf744796")
|
||||
;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "26f1d5db9476d0e84ab55627fbb72b1b")
|
||||
;;; Generated autoloads from ps-mule.el
|
||||
|
||||
(defvar ps-multibyte-buffer nil "\
|
||||
|
|
|
|||
|
|
@ -1,3 +1,19 @@
|
|||
2010-10-14 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-14 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* font.c (Ffont_variation_glyphs):
|
||||
* ccl.c (Fccl_execute_on_string): Fix typo in docstring.
|
||||
|
||||
2010-10-14 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
* w32fns.c (w32_wnd_proc, file_dialog_callback):
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -2073,7 +2073,7 @@
|
|||
|
||||
* xfns.c (Fx_get_default): Add (unsigned char *) cast.
|
||||
|
||||
* window.c: typo.
|
||||
* window.c: Typo.
|
||||
|
||||
1987-02-09 Richard M. Stallman (rms@prep)
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -448,7 +448,7 @@ Lisp_Object Vtranslation_hash_table_vector;
|
|||
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]. */
|
||||
|
||||
|
|
@ -2044,7 +2044,7 @@ If R0..R7 are nil, they are initialized to 0.
|
|||
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,
|
||||
|
|
|
|||
54
src/coding.c
54
src/coding.c
|
|
@ -166,7 +166,7 @@ detect_coding_XXX (struct coding_system *coding,
|
|||
|
||||
while (1)
|
||||
{
|
||||
/* Get one byte from the source. If the souce is exausted, jump
|
||||
/* Get one byte from the source. If the source is exhausted, jump
|
||||
to no_more_source:. */
|
||||
ONE_MORE_BYTE (c);
|
||||
|
||||
|
|
@ -180,7 +180,7 @@ detect_coding_XXX (struct coding_system *coding,
|
|||
return 0;
|
||||
|
||||
no_more_source:
|
||||
/* The source exausted successfully. */
|
||||
/* The source exhausted successfully. */
|
||||
detect_info->found |= found;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -530,7 +530,7 @@ enum iso_code_class_type
|
|||
on output. */
|
||||
#define CODING_ISO_FLAG_DESIGNATE_AT_BOL 0x0400
|
||||
|
||||
/* If set, do not encode unsafe charactes on output. */
|
||||
/* If set, do not encode unsafe characters on output. */
|
||||
#define CODING_ISO_FLAG_SAFE 0x0800
|
||||
|
||||
/* If set, extra latin codes (128..159) are accepted as a valid code
|
||||
|
|
@ -686,7 +686,7 @@ enum coding_category
|
|||
static Lisp_Object Vcoding_category_list;
|
||||
|
||||
/* Table of coding categories (Lisp symbols). This variable is for
|
||||
internal use oly. */
|
||||
internal use only. */
|
||||
static Lisp_Object Vcoding_category_table;
|
||||
|
||||
/* Table of coding-categories ordered by priority. */
|
||||
|
|
@ -818,7 +818,7 @@ static struct coding_system coding_categories[coding_category_max];
|
|||
} while (0)
|
||||
|
||||
|
||||
/* Like EMIT_ONE_ASCII_BYTE byt store two bytes; C1 and C2. */
|
||||
/* Like EMIT_ONE_ASCII_BYTE but store two bytes; C1 and C2. */
|
||||
|
||||
#define EMIT_TWO_ASCII_BYTES(c1, c2) \
|
||||
do { \
|
||||
|
|
@ -1227,7 +1227,7 @@ alloc_destination (struct coding_system *coding, EMACS_INT nbytes,
|
|||
|
||||
METHOD is one of enum composition_method.
|
||||
|
||||
Optionnal COMPOSITION-COMPONENTS are characters and composition
|
||||
Optional COMPOSITION-COMPONENTS are characters and composition
|
||||
rules.
|
||||
|
||||
In the case of CODING_ANNOTATE_CHARSET_MASK, one element CHARSET-ID
|
||||
|
|
@ -1932,7 +1932,7 @@ encode_coding_utf_16 (struct coding_system *coding)
|
|||
CHARS is 0xA0 plus a number of characters composed by this
|
||||
data,
|
||||
|
||||
COMPONENTs are characters of multibye form or composition
|
||||
COMPONENTs are characters of multibyte form or composition
|
||||
rules encoded by two-byte of ASCII codes.
|
||||
|
||||
In addition, for backward compatibility, the following formats are
|
||||
|
|
@ -2428,8 +2428,8 @@ decode_coding_emacs_mule (struct coding_system *coding)
|
|||
const unsigned char *src_end = coding->source + coding->src_bytes;
|
||||
const unsigned char *src_base;
|
||||
int *charbuf = coding->charbuf + coding->charbuf_used;
|
||||
/* We may produce two annocations (charset and composition) in one
|
||||
loop and one more charset annocation at the end. */
|
||||
/* We may produce two annotations (charset and composition) in one
|
||||
loop and one more charset annotation at the end. */
|
||||
int *charbuf_end
|
||||
= coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 3);
|
||||
int consumed_chars = 0, consumed_chars_base;
|
||||
|
|
@ -2505,7 +2505,7 @@ decode_coding_emacs_mule (struct coding_system *coding)
|
|||
/* emacs_mule_char can load a charset map from a file, which
|
||||
allocates a large structure and might cause buffer text
|
||||
to be relocated as result. Thus, we need to remember the
|
||||
original pointer to buffer text, and fixup all related
|
||||
original pointer to buffer text, and fix up all related
|
||||
pointers after the call. */
|
||||
const unsigned char *orig = coding->source;
|
||||
EMACS_INT offset;
|
||||
|
|
@ -2532,7 +2532,7 @@ decode_coding_emacs_mule (struct coding_system *coding)
|
|||
cmp_status->ncomps -= nchars;
|
||||
}
|
||||
|
||||
/* Now if C >= 0, we found a normally encoded characer, if C <
|
||||
/* Now if C >= 0, we found a normally encoded character, if C <
|
||||
0, we found an old-style composition component character or
|
||||
rule. */
|
||||
|
||||
|
|
@ -3043,7 +3043,7 @@ setup_iso_safe_charsets (Lisp_Object attrs)
|
|||
|
||||
|
||||
/* See the above "GENERAL NOTES on `detect_coding_XXX ()' functions".
|
||||
Check if a text is encoded in one of ISO-2022 based codig systems.
|
||||
Check if a text is encoded in one of ISO-2022 based coding systems.
|
||||
If it is, return 1, else return 0. */
|
||||
|
||||
static int
|
||||
|
|
@ -3452,7 +3452,7 @@ finish_composition (int *charbuf, struct composition_status *cmp_status)
|
|||
return new_chars;
|
||||
}
|
||||
|
||||
/* If characers are under composition, finish the composition. */
|
||||
/* If characters are under composition, finish the composition. */
|
||||
#define MAYBE_FINISH_COMPOSITION() \
|
||||
do { \
|
||||
if (cmp_status->state != COMPOSING_NO) \
|
||||
|
|
@ -3558,8 +3558,8 @@ decode_coding_iso_2022 (struct coding_system *coding)
|
|||
const unsigned char *src_end = coding->source + coding->src_bytes;
|
||||
const unsigned char *src_base;
|
||||
int *charbuf = coding->charbuf + coding->charbuf_used;
|
||||
/* We may produce two annocations (charset and composition) in one
|
||||
loop and one more charset annocation at the end. */
|
||||
/* We may produce two annotations (charset and composition) in one
|
||||
loop and one more charset annotation at the end. */
|
||||
int *charbuf_end
|
||||
= coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 3);
|
||||
int consumed_chars = 0, consumed_chars_base;
|
||||
|
|
@ -3861,7 +3861,7 @@ decode_coding_iso_2022 (struct coding_system *coding)
|
|||
goto invalid_code;
|
||||
/* For the moment, nested direction is not supported.
|
||||
So, `coding->mode & CODING_MODE_DIRECTION' zero means
|
||||
left-to-right, and nozero means right-to-left. */
|
||||
left-to-right, and nonzero means right-to-left. */
|
||||
ONE_MORE_BYTE (c1);
|
||||
switch (c1)
|
||||
{
|
||||
|
|
@ -4766,7 +4766,7 @@ decode_coding_sjis (struct coding_system *coding)
|
|||
const unsigned char *src_end = coding->source + coding->src_bytes;
|
||||
const unsigned char *src_base;
|
||||
int *charbuf = coding->charbuf + coding->charbuf_used;
|
||||
/* We may produce one charset annocation in one loop and one more at
|
||||
/* We may produce one charset annotation in one loop and one more at
|
||||
the end. */
|
||||
int *charbuf_end
|
||||
= coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2);
|
||||
|
|
@ -4884,7 +4884,7 @@ decode_coding_big5 (struct coding_system *coding)
|
|||
const unsigned char *src_end = coding->source + coding->src_bytes;
|
||||
const unsigned char *src_base;
|
||||
int *charbuf = coding->charbuf + coding->charbuf_used;
|
||||
/* We may produce one charset annocation in one loop and one more at
|
||||
/* We may produce one charset annotation in one loop and one more at
|
||||
the end. */
|
||||
int *charbuf_end
|
||||
= coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2);
|
||||
|
|
@ -5541,7 +5541,7 @@ decode_coding_charset (struct coding_system *coding)
|
|||
const unsigned char *src_end = coding->source + coding->src_bytes;
|
||||
const unsigned char *src_base;
|
||||
int *charbuf = coding->charbuf + coding->charbuf_used;
|
||||
/* We may produce one charset annocation in one loop and one more at
|
||||
/* We may produce one charset annotation in one loop and one more at
|
||||
the end. */
|
||||
int *charbuf_end
|
||||
= coding->charbuf + coding->charbuf_size - (MAX_ANNOTATION_LENGTH * 2);
|
||||
|
|
@ -6144,14 +6144,14 @@ complement_process_encoding_system (Lisp_Object coding_system)
|
|||
o coding-category-iso-7-else
|
||||
|
||||
The category for a coding system which has the same code range
|
||||
as ISO2022 of 7-bit environemnt but uses locking shift or
|
||||
as ISO2022 of 7-bit environment but uses locking shift or
|
||||
single shift functions. Assigned the coding-system (Lisp
|
||||
symbol) `iso-2022-7bit-lock' by default.
|
||||
|
||||
o coding-category-iso-8-else
|
||||
|
||||
The category for a coding system which has the same code range
|
||||
as ISO2022 of 8-bit environemnt but uses locking shift or
|
||||
as ISO2022 of 8-bit environment but uses locking shift or
|
||||
single shift functions. Assigned the coding-system (Lisp
|
||||
symbol) `iso-2022-8bit-ss2' by default.
|
||||
|
||||
|
|
@ -7548,7 +7548,7 @@ static Lisp_Object Vcode_conversion_reused_workbuf;
|
|||
static int reused_workbuf_in_use;
|
||||
|
||||
|
||||
/* Return a working buffer of code convesion. MULTIBYTE specifies the
|
||||
/* Return a working buffer of code conversion. MULTIBYTE specifies the
|
||||
multibyteness of returning buffer. */
|
||||
|
||||
static Lisp_Object
|
||||
|
|
@ -8200,7 +8200,7 @@ function `define-coding-system'. */)
|
|||
|
||||
/* Detect how the bytes at SRC of length SRC_BYTES are encoded. If
|
||||
HIGHEST is nonzero, return the coding system of the highest
|
||||
priority among the detected coding systems. Otherwize return a
|
||||
priority among the detected coding systems. Otherwise return a
|
||||
list of detected coding systems sorted by their priorities. If
|
||||
MULTIBYTEP is nonzero, it is assumed that the bytes are in correct
|
||||
multibyte form but contains only ASCII and eight-bit chars.
|
||||
|
|
@ -9302,7 +9302,7 @@ DEFUN ("set-terminal-coding-system-internal", Fset_terminal_coding_system_intern
|
|||
setup_coding_system (Fcheck_coding_system (coding_system), terminal_coding);
|
||||
/* We had better not send unsafe characters to terminal. */
|
||||
terminal_coding->mode |= CODING_MODE_SAFE_ENCODING;
|
||||
/* Characer composition should be disabled. */
|
||||
/* Character composition should be disabled. */
|
||||
terminal_coding->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK;
|
||||
terminal_coding->src_multibyte = 1;
|
||||
terminal_coding->dst_multibyte = 0;
|
||||
|
|
@ -9318,7 +9318,7 @@ DEFUN ("set-safe-terminal-coding-system-internal",
|
|||
CHECK_SYMBOL (coding_system);
|
||||
setup_coding_system (Fcheck_coding_system (coding_system),
|
||||
&safe_terminal_coding);
|
||||
/* Characer composition should be disabled. */
|
||||
/* Character composition should be disabled. */
|
||||
safe_terminal_coding.common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK;
|
||||
safe_terminal_coding.src_multibyte = 1;
|
||||
safe_terminal_coding.dst_multibyte = 0;
|
||||
|
|
@ -9352,7 +9352,7 @@ DEFUN ("set-keyboard-coding-system-internal", Fset_keyboard_coding_system_intern
|
|||
else
|
||||
Fcheck_coding_system (coding_system);
|
||||
setup_coding_system (coding_system, TERMINAL_KEYBOARD_CODING (t));
|
||||
/* Characer composition should be disabled. */
|
||||
/* Character composition should be disabled. */
|
||||
TERMINAL_KEYBOARD_CODING (t)->common_flags
|
||||
&= ~CODING_ANNOTATE_COMPOSITION_MASK;
|
||||
return Qnil;
|
||||
|
|
@ -9720,7 +9720,7 @@ usage: (define-coding-system-internal ...) */)
|
|||
|
||||
If Nth element is a list of charset IDs, N is the first byte
|
||||
of one of them. The list is sorted by dimensions of the
|
||||
charsets. A charset of smaller dimension comes firtst. */
|
||||
charsets. A charset of smaller dimension comes first. */
|
||||
val = Fmake_vector (make_number (256), Qnil);
|
||||
|
||||
for (tail = charset_list; CONSP (tail); tail = XCDR (tail))
|
||||
|
|
|
|||
54
src/font.c
54
src/font.c
|
|
@ -3723,6 +3723,58 @@ font_get_frame_data (FRAME_PTR f, struct font_driver *driver)
|
|||
}
|
||||
|
||||
|
||||
/* 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 (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
|
||||
|
|
@ -4486,7 +4538,7 @@ DEFUN ("font-variation-glyphs", Ffont_variation_glyphs, Sfont_variation_glyphs,
|
|||
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. */)
|
||||
(Lisp_Object font_object, Lisp_Object character)
|
||||
|
|
|
|||
|
|
@ -581,7 +581,7 @@ struct font_driver
|
|||
FONT-ENTITY and it must be opened to check it, return -1. */
|
||||
int (*has_char) (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) (struct font *font, int c);
|
||||
|
||||
|
|
@ -821,6 +821,11 @@ extern int font_put_frame_data (FRAME_PTR f,
|
|||
extern void *font_get_frame_data (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;
|
||||
extern void syms_of_ftfont (void);
|
||||
|
|
|
|||
43
src/ftfont.c
43
src/ftfont.c
|
|
@ -88,7 +88,7 @@ static Lisp_Object ftfont_lookup_cache (Lisp_Object,
|
|||
enum ftfont_cache_for);
|
||||
|
||||
static void ftfont_filter_properties (Lisp_Object font, Lisp_Object alist);
|
||||
|
||||
|
||||
Lisp_Object ftfont_font_format (FcPattern *, Lisp_Object);
|
||||
|
||||
#define SYMBOL_FcChar8(SYM) (FcChar8 *) SDATA (SYMBOL_NAME (SYM))
|
||||
|
|
@ -260,7 +260,7 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra)
|
|||
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));
|
||||
|
|
@ -2093,7 +2093,7 @@ ftfont_drive_otf (font, spec, in, from, to, out, adjustment)
|
|||
return to;
|
||||
}
|
||||
|
||||
static int
|
||||
static int
|
||||
ftfont_try_otf (MFLTFont *font, MFLTOtfSpec *spec,
|
||||
MFLTGlyphString *in, int from, int to)
|
||||
{
|
||||
|
|
@ -2645,42 +2645,7 @@ static const char *ftfont_non_booleans [] = {
|
|||
static void
|
||||
ftfont_filter_properties (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)
|
||||
{
|
||||
const 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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
10
src/nsterm.m
10
src/nsterm.m
|
|
@ -145,24 +145,24 @@ Updated by Christian Limpach (chris@nice.ch)
|
|||
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. */
|
||||
|
|
|
|||
|
|
@ -1401,7 +1401,7 @@ static void print_check_string_charset_prop (INTERVAL interval, Lisp_Object stri
|
|||
#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
|
||||
|
|
|
|||
|
|
@ -4089,7 +4089,7 @@ analyse_first (const re_char *p, const re_char *pend, char *fastmap, const int m
|
|||
&& 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;
|
||||
|
||||
|
|
|
|||
|
|
@ -2970,7 +2970,7 @@ convert_time (FILETIME ft)
|
|||
|
||||
if (!init)
|
||||
{
|
||||
initialize_utc_base();
|
||||
initialize_utc_base ();
|
||||
init = 1;
|
||||
}
|
||||
|
||||
|
|
@ -5037,7 +5037,7 @@ fcntl (int s, int cmd, int options)
|
|||
unsigned long nblock = 1;
|
||||
int rc = pfn_ioctlsocket (SOCK_HANDLE (s), FIONBIO, &nblock);
|
||||
if (rc == SOCKET_ERROR)
|
||||
set_errno();
|
||||
set_errno ();
|
||||
/* Keep track of the fact that we set this to non-blocking. */
|
||||
fd_info[s].flags |= FILE_NDELAY;
|
||||
return rc;
|
||||
|
|
@ -5935,8 +5935,7 @@ serial_open (char *port)
|
|||
|
||||
/* For serial-process-configure */
|
||||
void
|
||||
serial_configure (struct Lisp_Process *p,
|
||||
Lisp_Object contact)
|
||||
serial_configure (struct Lisp_Process *p, Lisp_Object contact)
|
||||
{
|
||||
Lisp_Object childp2 = Qnil;
|
||||
Lisp_Object tem = Qnil;
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ struct MONITOR_INFO
|
|||
};
|
||||
|
||||
/* Reportedly, VS 6 does not have this in its headers. */
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1300
|
||||
#if defined (_MSC_VER) && _MSC_VER < 1300
|
||||
DECLARE_HANDLE(HMONITOR);
|
||||
#endif
|
||||
|
||||
|
|
@ -1870,7 +1870,6 @@ x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
x_set_scroll_bar_default_width (struct frame *f)
|
||||
{
|
||||
|
|
@ -3918,7 +3917,6 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
|
|||
return DefWindowProc (hwnd, msg, wParam, lParam);
|
||||
}
|
||||
|
||||
|
||||
/* The most common default return code for handled messages is 0. */
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -4359,7 +4357,6 @@ This function is an internal primitive--use `make-frame' instead. */)
|
|||
x_default_parameter (f, parameters, Qright_fringe, Qnil,
|
||||
"rightFringe", "RightFringe", RES_TYPE_NUMBER);
|
||||
|
||||
|
||||
/* Init faces before x_default_parameter is called for scroll-bar
|
||||
parameters because that function calls x_set_scroll_bar_width,
|
||||
which calls change_frame_size, which calls Fset_window_buffer,
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ w32font_has_char (Lisp_Object entity, int c)
|
|||
}
|
||||
|
||||
/* 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
|
||||
|
|
@ -1798,7 +1798,7 @@ w32_decode_weight (int fnweight)
|
|||
if (fnweight >= FW_NORMAL) return 100;
|
||||
if (fnweight >= FW_LIGHT) return 50;
|
||||
if (fnweight >= FW_EXTRALIGHT) return 40;
|
||||
if (fnweight > FW_THIN) return 20;
|
||||
if (fnweight > FW_THIN) return 20;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1812,7 +1812,7 @@ w32_encode_weight (int n)
|
|||
if (n >= 100) return FW_NORMAL;
|
||||
if (n >= 50) return FW_LIGHT;
|
||||
if (n >= 40) return FW_EXTRALIGHT;
|
||||
if (n >= 20) return FW_THIN;
|
||||
if (n >= 20) return FW_THIN;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1822,9 +1822,9 @@ static Lisp_Object
|
|||
w32_to_fc_weight (int n)
|
||||
{
|
||||
if (n >= FW_EXTRABOLD) return intern ("black");
|
||||
if (n >= FW_BOLD) return intern ("bold");
|
||||
if (n >= FW_SEMIBOLD) return intern ("demibold");
|
||||
if (n >= FW_NORMAL) return intern ("medium");
|
||||
if (n >= FW_BOLD) return intern ("bold");
|
||||
if (n >= FW_SEMIBOLD) return intern ("demibold");
|
||||
if (n >= FW_NORMAL) return intern ("medium");
|
||||
return intern ("light");
|
||||
}
|
||||
|
||||
|
|
@ -1912,7 +1912,6 @@ fill_in_logfont (FRAME_PTR f, LOGFONT *logfont, Lisp_Object font_spec)
|
|||
logfont->lfPitchAndFamily = family | DEFAULT_PITCH;
|
||||
}
|
||||
|
||||
|
||||
/* Set pitch based on the spacing property. */
|
||||
tmp = AREF (font_spec, FONT_SPACING_INDEX);
|
||||
if (INTEGERP (tmp))
|
||||
|
|
@ -2378,6 +2377,23 @@ in the font selection dialog. */)
|
|||
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 (Lisp_Object font, Lisp_Object alist)
|
||||
{
|
||||
font_filter_properties (font, alist, w32font_booleans, w32font_non_booleans);
|
||||
}
|
||||
|
||||
struct font_driver w32font_driver =
|
||||
{
|
||||
0, /* Qgdi */
|
||||
|
|
@ -2407,7 +2423,7 @@ struct font_driver w32font_driver =
|
|||
NULL, /* shape */
|
||||
NULL, /* check */
|
||||
NULL, /* get_variation_glyphs */
|
||||
NULL, /* filter_properties */
|
||||
w32font_filter_properties,
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ round_heap (unsigned long align)
|
|||
sbrk (need_to_alloc);
|
||||
}
|
||||
|
||||
#if (_MSC_VER >= 1000 && _MSC_VER < 1300 && !defined(USE_CRT_DLL))
|
||||
#if (_MSC_VER >= 1000 && _MSC_VER < 1300 && !defined (USE_CRT_DLL))
|
||||
|
||||
/* MSVC 4.2 invokes these functions from mainCRTStartup to initialize
|
||||
a heap via HeapCreate. They are normally defined by the runtime,
|
||||
|
|
|
|||
|
|
@ -997,7 +997,7 @@ w32_dialog_show (FRAME_PTR f, int keymaps,
|
|||
Lisp_Object title, Lisp_Object header,
|
||||
char **error)
|
||||
{
|
||||
int i, nb_buttons=0;
|
||||
int i, nb_buttons = 0;
|
||||
char dialog_name[6];
|
||||
int menu_item_selection;
|
||||
|
||||
|
|
@ -1740,7 +1740,7 @@ syms_of_w32menu (void)
|
|||
void
|
||||
globals_of_w32menu (void)
|
||||
{
|
||||
/* See if Get/SetMenuItemInfo functions are available. */
|
||||
/* See if Get/SetMenuItemInfo functions are available. */
|
||||
HMODULE user32 = GetModuleHandle ("user32.dll");
|
||||
get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, "GetMenuItemInfoA");
|
||||
set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, "SetMenuItemInfoA");
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ new_child (void)
|
|||
child_process *cp;
|
||||
DWORD id;
|
||||
|
||||
for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--)
|
||||
for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
|
||||
if (!CHILD_ACTIVE (cp))
|
||||
goto Initialise;
|
||||
if (child_proc_count == MAX_CHILDREN)
|
||||
|
|
@ -268,7 +268,7 @@ find_child_pid (DWORD pid)
|
|||
{
|
||||
child_process *cp;
|
||||
|
||||
for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--)
|
||||
for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
|
||||
if (CHILD_ACTIVE (cp) && pid == cp->pid)
|
||||
return cp;
|
||||
return NULL;
|
||||
|
|
@ -495,7 +495,7 @@ sys_wait (int *status)
|
|||
}
|
||||
else
|
||||
{
|
||||
for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--)
|
||||
for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
|
||||
/* some child_procs might be sockets; ignore them */
|
||||
if (CHILD_ACTIVE (cp) && cp->procinfo.hProcess
|
||||
&& (cp->fd < 0 || (fd_info[cp->fd].flags & FILE_AT_EOF) != 0))
|
||||
|
|
@ -895,7 +895,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
|
|||
escape_char = is_cygnus_app ? '"' : '\\';
|
||||
}
|
||||
|
||||
/* Cygwin apps needs quoting a bit more often */
|
||||
/* Cygwin apps needs quoting a bit more often. */
|
||||
if (escape_char == '"')
|
||||
sepchars = "\r\n\t\f '";
|
||||
|
||||
|
|
@ -1245,7 +1245,7 @@ sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
|
|||
count_children:
|
||||
/* Add handles of child processes. */
|
||||
nc = 0;
|
||||
for (cp = child_procs+(child_proc_count-1); cp >= child_procs; cp--)
|
||||
for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--)
|
||||
/* Some child_procs might be sockets; ignore them. Also some
|
||||
children may have died already, but we haven't finished reading
|
||||
the process output; ignore them too. */
|
||||
|
|
|
|||
|
|
@ -1072,7 +1072,7 @@ syms_of_w32select (void)
|
|||
When sending or receiving text via cut_buffer, selection, and
|
||||
clipboard, the text is encoded or decoded by this coding system.
|
||||
The default value is the current system default encoding on 9x/Me and
|
||||
`utf-16le-dos' (Unicode) on NT/W2K/XP. */);
|
||||
`utf-16le-dos' (Unicode) on NT/W2K/XP. */);
|
||||
/* The actual value is set dynamically in the dumped Emacs, see
|
||||
below. */
|
||||
Vselection_coding_system = Qnil;
|
||||
|
|
|
|||
|
|
@ -893,7 +893,7 @@ w32_set_terminal_modes (struct terminal *term)
|
|||
{
|
||||
}
|
||||
|
||||
/* This is called when exiting or suspending Emacs. Exiting will make
|
||||
/* This is called when exiting or suspending Emacs. Exiting will make
|
||||
the W32 windows go away, and suspending requires no action. */
|
||||
|
||||
static void
|
||||
|
|
@ -4239,7 +4239,7 @@ w32_read_socket (struct terminal *terminal, int expected,
|
|||
inev.frame_or_window = window;
|
||||
}
|
||||
|
||||
last_window=window;
|
||||
last_window = window;
|
||||
}
|
||||
if (!note_mouse_movement (f, &msg.msg))
|
||||
help_echo_string = previous_help_echo_string;
|
||||
|
|
@ -5601,7 +5601,7 @@ x_make_frame_visible (struct frame *f)
|
|||
/* Adjust vertical window position in order to avoid being
|
||||
covered by a task bar placed at the bottom of the desktop. */
|
||||
SystemParametersInfo (SPI_GETWORKAREA, 0, &workarea_rect, 0);
|
||||
GetWindowRect (FRAME_W32_WINDOW(f), &window_rect);
|
||||
GetWindowRect (FRAME_W32_WINDOW (f), &window_rect);
|
||||
if (window_rect.bottom > workarea_rect.bottom
|
||||
&& window_rect.top > workarea_rect.top)
|
||||
f->top_pos = max (window_rect.top
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@ uniscribe_shape (Lisp_Object lgstring)
|
|||
}
|
||||
|
||||
/* 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 (struct font *font, int c)
|
||||
|
|
|
|||
|
|
@ -408,7 +408,6 @@ XParseGeometry (char *string,
|
|||
return (0);
|
||||
strind = nextCharacter;
|
||||
mask |= YNegative;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -422,7 +421,7 @@ XParseGeometry (char *string,
|
|||
}
|
||||
}
|
||||
|
||||
/* If strind isn't at the end of the string the it's an invalid
|
||||
/* If strind isn't at the end of the string then it's an invalid
|
||||
geometry specification. */
|
||||
|
||||
if (*strind != '\0') return (0);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue