mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-22 10:26:20 +00:00
Code Issues Releases Activity

Merge changes from emacs-23 branch

Browse Source
This commit is contained in:
Chong Yidong 2011-03-19 14:49:31 -04:00
commit b14e3e21ec
11 changed files with 68 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -2257,7 +2257,7 @@ if test "${HAVE_X11}" = "yes"; then
dnl if -lfreetype is not specified.
dnl The following is needed to set FREETYPE_LIBS.
PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes,
HAVE_FREETYPE=no)
HAVE_FREETYPE=no)
test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype)
fi

8
doc/lispref/ChangeLog
View File

@ -1,3 +1,11 @@
2011-03-16 Stefan Monnier <monnier@iro.umontreal.ca>
* strings.texi (String Conversion): Don't mention
string-make-(uni|multi)byte (bug#8262).
* nonascii.texi (Converting Representations): Fix up range.
* keymaps.texi (Key Binding Commands): Update code point, avoid
"unibyte character" and remove mention of unibyte bindings.
2011-03-10 Eli Zaretskii <eliz@gnu.org>
* modes.texi (Operator Precedence Grammars): Don't use characters

14
doc/lispref/keymaps.texi
View File

@ -1705,15 +1705,11 @@ or
@noindent
and your language environment is multibyte Latin-1, these commands
actually bind the multibyte character with code 2294, not the unibyte
Latin-1 character with code 246 (@kbd{M-v}). In order to use this
binding, you need to enter the multibyte Latin-1 character as keyboard
input. One way to do this is by using an appropriate input method
(@pxref{Input Methods, , Input Methods, emacs, The GNU Emacs Manual}).
If you want to use a unibyte character in the key binding, you can
construct the key sequence string using @code{multibyte-char-to-unibyte}
or @code{string-make-unibyte} (@pxref{Converting Representations}).
actually bind the multibyte character with code 246, not the byte
code 246 (@kbd{M-v}) sent by a Latin-1 terminal. In order to use this
binding, you need to teach Emacs how to decode the keyboard by using an
appropriate input method (@pxref{Input Methods, , Input Methods, emacs, The GNU
Emacs Manual}).
@deffn Command global-set-key key binding
This function sets the binding of @var{key} in the current global map

2
doc/lispref/nonascii.texi
View File

@ -167,7 +167,7 @@ acceptable because the buffer's representation is a choice made by the
user that cannot be overridden automatically.
Converting unibyte text to multibyte text leaves @acronym{ASCII}
characters unchanged, and converts bytes with codes 128 through 159 to
characters unchanged, and converts bytes with codes 128 through 255 to
the multibyte representation of raw eight-bit bytes.
Converting multibyte text to unibyte converts all @acronym{ASCII}

4
doc/lispref/strings.texi
View File

@ -554,8 +554,8 @@ strings and integers. @code{format} (@pxref{Formatting Strings}) and
@code{prin1-to-string} (@pxref{Output Functions}) can also convert
Lisp objects into strings. @code{read-from-string} (@pxref{Input
Functions}) can ``convert'' a string representation of a Lisp object
into an object. The functions @code{string-make-multibyte} and
@code{string-make-unibyte} convert the text representation of a string
into an object. The functions @code{string-to-multibyte} and
@code{string-to-unibyte} convert the text representation of a string
(@pxref{Converting Representations}).
@xref{Documentation}, for functions that produce textual descriptions

19
lisp/ChangeLog
View File

@ -1,3 +1,22 @@
2011-03-19 Eli Zaretskii <eliz@gnu.org>
* emerge.el (emerge-metachars): Separate value for ms-dos and
windows-nt systems.
(emerge-protect-metachars): Quote correctly for ms-dos and
windows-nt systems.
2011-03-19 Ralph Schleicher <rs@ralph-schleicher.de>
* info.el (info-initialize): Replace all uses of `:' with
path-separator for compatibility with non-Unix systems.
Cache quoting of path-separator. (Bug#8258)
2011-03-19 Juanma Barranquero <lekktu@gmail.com>
* avoid.el (mouse-avoidance-mode, mouse-avoidance-nudge-dist)
(mouse-avoidance-threshold, mouse-avoidance-banish-destination)
(mouse-avoidance-mode): Fix typos in docstrings.
2011-03-19 Chong Yidong <cyd@stupidchicken.com>
* startup.el (package-subdirectory-regexp): Move from package.el.

15
lisp/avoid.el
View File

@ -76,7 +76,7 @@
;;;###autoload
(defcustom mouse-avoidance-mode nil
"Activate mouse avoidance mode.
"Activate Mouse Avoidance mode.
See function `mouse-avoidance-mode' for possible values.
Setting this variable directly does not take effect;
use either \\[customize] or the function `mouse-avoidance-mode'."
@ -85,8 +85,7 @@ use either \\[customize] or the function `mouse-avoidance-mode'."
(mouse-avoidance-mode (or value 'none)))
:initialize 'custom-initialize-default
:type '(choice (const :tag "none" nil) (const banish) (const jump)
(const animate) (const exile) (const proteus)
)
(const animate) (const exile) (const proteus))
:group 'avoid
:require 'avoid
:version "20.3")
@ -94,7 +93,7 @@ use either \\[customize] or the function `mouse-avoidance-mode'."
(defcustom mouse-avoidance-nudge-dist 15
"Average distance that mouse will be moved when approached by cursor.
Only applies in Mouse-Avoidance mode `jump' and its derivatives.
Only applies in Mouse Avoidance mode `jump' and its derivatives.
For best results make this larger than `mouse-avoidance-threshold'."
:type 'integer
:group 'avoid)
@ -112,7 +111,7 @@ For best results make this larger than `mouse-avoidance-threshold'."
(defcustom mouse-avoidance-threshold 5
"Mouse-pointer's flight distance.
If the cursor gets closer than this, the mouse pointer will move away.
Only applies in mouse-avoidance-modes `animate' and `jump'."
Only applies in Mouse Avoidance modes `animate' and `jump'."
:type 'integer
:group 'avoid)
@ -183,7 +182,7 @@ Acceptable distance is defined by `mouse-avoidance-threshold'."
mouse-avoidance-threshold))))))
(defun mouse-avoidance-banish-destination ()
"The position to which Mouse-Avoidance mode `banish' moves the mouse.
"The position to which Mouse Avoidance mode `banish' moves the mouse.
You can redefine this if you want the mouse banished to a different corner."
(let* ((pos (window-edges)))
(cons (- (nth 2 pos) 2)
@ -333,7 +332,7 @@ redefine this function to suit your own tastes."
;;;###autoload
(defun mouse-avoidance-mode (&optional mode)
"Set cursor avoidance mode to MODE.
"Set Mouse Avoidance mode to MODE.
MODE should be one of the symbols `banish', `exile', `jump', `animate',
`cat-and-mouse', `proteus', or `none'.
@ -353,7 +352,7 @@ Effects of the different modes:
Whenever the mouse is moved, the frame is also raised.
\(see `mouse-avoidance-threshold' for definition of \"too close\",
\(See `mouse-avoidance-threshold' for definition of \"too close\",
and `mouse-avoidance-nudge-dist' and `mouse-avoidance-nudge-var' for
definition of \"random distance\".)"
(interactive

10
lisp/info.el
View File

@ -594,15 +594,15 @@ in `Info-file-supports-index-cookies-list'."
(defun info-initialize ()
"Initialize `Info-directory-list', if that hasn't been done yet."
(unless Info-directory-list
(let ((path (getenv "INFOPATH")))
(let ((path (getenv "INFOPATH"))
(sep (regexp-quote path-separator)))
(setq Info-directory-list
(prune-directory-list
(if path
(if (string-match ":\\'" path)
(append (split-string (substring path 0 -1)
(regexp-quote path-separator))
(if (string-match-p (concat sep "\\'") path)
(append (split-string (substring path 0 -1) sep)
(Info-default-dirs))
(split-string path (regexp-quote path-separator)))
(split-string path sep))
(Info-default-dirs)))))))
;;;###autoload

23
lisp/vc/emerge.el
View File

@ -3176,21 +3176,26 @@ See also `auto-save-file-name-p'."
;; Metacharacters that have to be protected from the shell when executing
;; a diff/diff3 command.
(defcustom emerge-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
"Characters that must be quoted with \\ when used in a shell command line.
(defcustom emerge-metachars
(if (memq system-type '(ms-dos windows-nt))
"[ \t\"<>|?*^&=]"
"[ \t\n!\"#$&'()*;<=>?[\\^`{|~]")
"Characters that must be quoted when used in a shell command line.
More precisely, a [...] regexp to match any one such character."
:type 'regexp
:group 'emerge)
;; Quote metacharacters (using \) when executing a diff/diff3 command.
(defun emerge-protect-metachars (s)
(let ((limit 0))
(while (string-match emerge-metachars s limit)
(setq s (concat (substring s 0 (match-beginning 0))
"\\"
(substring s (match-beginning 0))))
(setq limit (1+ (match-end 0)))))
s)
(if (memq system-type '(ms-dos windows-nt))
(shell-quote-argument s)
(let ((limit 0))
(while (string-match emerge-metachars s limit)
(setq s (concat (substring s 0 (match-beginning 0))
"\\"
(substring s (match-beginning 0))))
(setq limit (1+ (match-end 0)))))
s))
(provide 'emerge)

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2011-03-19 Juanma Barranquero <lekktu@gmail.com>
* xfaces.c (Fx_load_color_file):
Read color file from absolute filename (bug#8250).
2011-03-19 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in: Update dependencies.

2
src/xfaces.c
View File

@ -6297,7 +6297,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string. */)
CHECK_STRING (filename);
abspath = Fexpand_file_name (filename, Qnil);
fp = fopen (SDATA (filename), "rt");
fp = fopen (SDATA (abspath), "rt");
if (fp)
{
char buf[512];