procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2011-08-31 13:02:51 -07:00
commit e91caa6011
13 changed files with 917 additions and 2678 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
autogen/configure vendored
View file

@ -4374,8 +4374,8 @@ configuration=${host_alias-${build_alias-$host}}
machine='' opsys='' unported=no
case "${canonical}" in
## GNU/Linux ports
*-*-linux-gnu*)
## GNU/Linux and similar ports
*-*-linux* )
opsys=gnu-linux
case ${canonical} in
alpha*) machine=alpha ;;
@ -4472,17 +4472,6 @@ case "${canonical}" in
CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
;;
ia64*-hp-hpux1[1-9]* )
machine=hp800 opsys=hpux11
## FIXME. Peter O'Gorman reports that dumping using unexelf.o doesn't
## work either: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6811
CANNOT_DUMP=yes
;;
hppa*-*-linux-gnu* )
machine=hp800 opsys=gnu-linux
;;
## IBM machines
rs6000-ibm-aix4.[23]* )
machine=ibmrs6000 opsys=aix4-2

4
doc/lispref/ChangeLog
View file

@ -1,3 +1,7 @@
2011-08-30 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
* lists.texi (Building Lists): Fix typo.
2011-08-30 Chong Yidong <cyd@stupidchicken.com>
* display.texi (Basic Faces): New node. Document new faces.

2
doc/lispref/lists.texi
View file

@ -462,7 +462,7 @@ element is @var{object}. Compare @code{make-list} with
@result{} nil
@end group
@group
(setq l (make-list 3 '(a b))
(setq l (make-list 3 '(a b)))
@result{} ((a b) (a b) (a b))
(eq (car l) (cadr l))
@result{} t

68
lisp/ChangeLog
View file

@ -1,3 +1,71 @@
2011-08-31 Martin Rudalics <rudalics@gmx.at>
* window.el (display-buffer-window): Rewrite doc-string.
(display-buffer-record-window): New function.
(display-buffer-macro-specifiers)
(display-buffer-even-window-sizes, display-buffer-set-height)
(display-buffer-set-width, display-buffer-in-window)
(display-buffer-reuse-window, display-buffer-split-specifiers)
(display-buffer-side-specifiers, display-buffer-split-window-1)
(display-buffer-split-window, display-buffer-split-atom-window)
(display-buffer-pop-up-window, display-buffer-pop-up-frame)
(display-buffer-pop-up-side-window, display-buffer-in-side-window)
(display-buffer-other-window-means-other-frame)
(display-buffer-normalize-special)
(display-buffer-normalize-default)
(display-buffer-normalize-argument)
(display-buffer-normalize-alist-1, display-buffer-normalize-alist)
(display-buffer-normalize-specifiers, display-buffer-frame)
(display-buffer-same-window, display-buffer-same-frame)
(display-buffer-other-window)
(display-buffer-same-frame-other-window)
(display-buffer-other-frame, pop-to-buffer-same-window)
(pop-to-buffer-same-frame, pop-to-buffer-other-window)
(pop-to-buffer-same-frame-other-window, pop-to-buffer-other-frame)
(switch-to-buffer-same-frame)
(switch-to-buffer-other-window-same-frame)
(display-buffer-alist-of-strings-p, display-buffer-alist-add)
(display-buffer-alist-set-1, display-buffer-alist-set-2)
(display-buffer-alist-set): Remove.
(display-buffer-function, special-display-buffer-names)
(special-display-regexps, special-display-function): In
doc-string refer to display-buffer-window and quit-restore
parameter.
(pop-up-frame-alist, pop-up-frame-function, special-display-p)
(special-display-frame-alist, special-display-popup-frame)
(same-window-buffer-names, same-window-regexps, same-window-p)
(pop-up-frames, display-buffer-reuse-frames, pop-up-windows)
(split-window-preferred-function, split-height-threshold)
(split-width-threshold, window-splittable-p)
(split-window-sensibly, window--try-to-split-window)
(window--frame-usable-p, even-window-heights)
(window--even-window-heights, window--display-buffer-1)
(window--display-buffer-2, display-buffer-other-frame): Restore
old Emacs 23 code, order and doc-strings where applicable.
(display-buffer-default, display-buffer-assq-regexp): New functions.
(display-buffer-alist): Rewrite doc-string.
(display-buffer-default-action)
(display-buffer-overriding-action): New variables.
(display-buffer, switch-to-buffer): Rewrite.
(pop-to-buffer): Restore Emacs 23 behavior but use
window-normalize-buffer-to-display.
(switch-to-buffer-other-window, switch-to-buffer-other-frame):
Restore Emacs 23 behavior but use
window-normalize-buffer-to-switch-to.
(pop-to-buffer-same-window): Rewrite.
(pop-to-buffer-other-window, pop-to-buffer-other-frame): Rewrite
using Emacs 23 options.
2011-08-31 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-root-regexp): Remove.
(tramp-completion-file-name-regexp-unified)
(tramp-completion-file-name-regexp-separate)
(tramp-completion-file-name-regexp-url): Don't use leading volume
letter on win32 systems. (Bug#5303, Bug#9311)
(tramp-drop-volume-letter): Simplify definition. Suggested by
Stefan Monnier <monnier@iro.umontreal.ca>.
2011-08-30 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (event-modifiers): Fix "missing modifier" part of docstring

9
lisp/gnus/ChangeLog
View file

@ -1,3 +1,12 @@
2011-08-30 Katsumi Yamaoka <yamaoka@jpl.org>
* auth-source.el: Autoload help-mode.
2011-08-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-group.el (gnus-group-name-charset): Don't bug out on server
names.
2011-08-27 Daiki Ueno <ueno@unixuser.org>
* mml-smime.el (mml-smime-epg-verify): Don't use the 4th arg of

2
lisp/gnus/auth-source.el
View file

@ -70,6 +70,8 @@
(autoload 'epg-context-set-armor "epg")
(autoload 'epg-encrypt-string "epg")
(autoload 'help-mode "help-mode" nil t)
(defvar secrets-enabled)
(defgroup auth-source nil

36
lisp/gnus/gnus-group.el
View file

@ -1194,21 +1194,27 @@ The following commands are available:
(gnus-group-mode)))
(defun gnus-group-name-charset (method group)
(if (null method)
(setq method (gnus-find-method-for-group group)))
(let ((item (or (assoc method gnus-group-name-charset-method-alist)
(and (consp method)
(assoc (list (car method) (cadr method))
gnus-group-name-charset-method-alist))))
(alist gnus-group-name-charset-group-alist)
result)
(if item
(cdr item)
(while (setq item (pop alist))
(if (string-match (car item) group)
(setq alist nil
result (cdr item))))
result)))
(unless method
(setq method (gnus-find-method-for-group group)))
(when (stringp method)
(setq method (gnus-server-to-method method)))
(if (eq (car method) 'nnimap)
;; IMAP groups should not be encoded, since they do the encoding
;; in utf7 in the protocol.
nil
(let ((item (or (assoc method gnus-group-name-charset-method-alist)
(and (consp method)
(assoc (list (car method) (cadr method))
gnus-group-name-charset-method-alist))))
(alist gnus-group-name-charset-group-alist)
result)
(if item
(cdr item)
(while (setq item (pop alist))
(if (string-match (car item) group)
(setq alist nil
result (cdr item))))
result))))
(defun gnus-group-name-decode (string charset)
;; Fixme: Don't decode in unibyte mode.

24
lisp/net/tramp.el
View file

@ -860,20 +860,10 @@ updated after changing this variable.
Also see `tramp-file-name-structure'.")
;;;###autoload
(defconst tramp-root-regexp
(if (memq system-type '(cygwin windows-nt))
"\\`\\([a-zA-Z]:\\)?/"
"\\`/")
"Beginning of an incomplete Tramp file name.
Usually, it is just \"\\\\`/\". On W32 systems, there might be a
volume letter, which will be removed by `tramp-drop-volume-letter'.")
;;;###autoload
(defconst tramp-completion-file-name-regexp-unified
(if (memq system-type '(cygwin windows-nt))
(concat tramp-root-regexp "[^/]\\{2,\\}\\'")
(concat tramp-root-regexp "[^/]*\\'"))
"\\`/[^/]\\{2,\\}\\'" "\\`/[^/]*\\'")
"Value for `tramp-completion-file-name-regexp' for unified remoting.
GNU Emacs uses a unified filename syntax for Tramp and Ange-FTP.
See `tramp-file-name-structure' for more explanations.
@ -882,14 +872,14 @@ On W32 systems, the volume letter must be ignored.")
;;;###autoload
(defconst tramp-completion-file-name-regexp-separate
(concat tramp-root-regexp "\\([[][^]]*\\)?\\'")
"\\`/\\([[][^]]*\\)?\\'"
"Value for `tramp-completion-file-name-regexp' for separate remoting.
XEmacs uses a separate filename syntax for Tramp and EFS.
See `tramp-file-name-structure' for more explanations.")
;;;###autoload
(defconst tramp-completion-file-name-regexp-url
(concat tramp-root-regexp "[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'")
"\\`/[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'"
"Value for `tramp-completion-file-name-regexp' for URL-like remoting.
See `tramp-file-name-structure' for more explanations.")
@ -1494,20 +1484,20 @@ progress reporter."
(tramp-compat-font-lock-add-keywords
'emacs-lisp-mode '("\\<tramp-with-progress-reporter\\>"))
(eval-and-compile ;; Silence compiler.
(defalias 'tramp-drop-volume-letter
(if (memq system-type '(cygwin windows-nt))
(defun tramp-drop-volume-letter (name)
(lambda (name)
"Cut off unnecessary drive letter from file NAME.
The functions `tramp-*-handle-expand-file-name' call `expand-file-name'
locally on a remote file name. When the local system is a W32 system
but the remote system is Unix, this introduces a superfluous drive
letter into the file name. This function removes it."
(save-match-data
(if (string-match tramp-root-regexp name)
(if (string-match "\\`[a-zA-Z]:/" name)
(replace-match "/" nil t name)
name)))
(defalias 'tramp-drop-volume-letter 'identity)))
'identity))
;;; Config Manipulation Functions:

5
lisp/org/ChangeLog
View file

@ -1,3 +1,8 @@
2011-08-31 Martin Rudalics <rudalics@gmx.at>
* org-compat.el (org-pop-to-buffer-same-window): Remove LABEL
argument from pop-to-buffer-same-window call.
2011-07-30 Carsten Dominik <carsten.dominik@gmail.com>
* ob.el (org-babel-src-block-regexp): If a code block has a body,

2
lisp/org/org-compat.el
View file

@ -438,7 +438,7 @@ With two arguments, return floor and remainder of their quotient."
"Pop to buffer specified by BUFFER-OR-NAME in the selected window."
(if (fboundp 'pop-to-buffer-same-window)
(funcall
'pop-to-buffer-same-window buffer-or-name norecord label)
'pop-to-buffer-same-window buffer-or-name norecord)
(funcall 'switch-to-buffer buffer-or-name norecord)))
(provide 'org-compat)

3402
lisp/window.el
View file

File diff suppressed because it is too large Load diff

21
src/ChangeLog
View file

@ -1,15 +1,5 @@
2011-08-31 Paul Eggert <eggert@cs.ucla.edu>
Avoid the use of snprintf.
* font.c (APPEND_SNPRINTF): Remove.
(font_unparse_xlfd):
* xterm.c (x_io_error_quitter):
Use esnprintf, not snprintf. That way, we don't have to worry
about porting to ancient platforms that lack snprintf.
(x_term_init): Use sprintf, not snprintf.
2011-08-30 Paul Eggert <eggert@cs.ucla.edu>
sprintf-related integer and memory overflow issues (Bug#9412).
* doprnt.c (doprnt): Support printing ptrdiff_t and intmax_t values.
@ -53,10 +43,9 @@
* font.c: Include <float.h>, for DBL_MAX_10_EXP.
(font_unparse_xlfd): Don't blindly alloca long strings.
Don't assume XINT result fits in int, or that XFLOAT_DATA * 10
fits in int, when using sprintf. Use single snprintf to count
fits in int, when using sprintf. Use single esnprintf to count
length of string rather than counting it via multiple sprintfs;
that's simpler and more reliable.
(APPEND_SPRINTF): New macro.
(font_unparse_fcname): Use it to avoid sprintf buffer overrun.
(generate_otf_features) [0 && HAVE_LIBOTF]: Use esprintf, not
sprintf, in case result does not fit in int.
@ -111,9 +100,17 @@
to avoid potential buffer overrun.
* xterm.c (x_io_error_quitter): Don't overrun sprintf buffer.
(x_term_init): Use sprintf, not snprintf, so that we need not
worry about ancient hosts that lack snprintf. The buffer cannot
possibly be overrun, so this is safe.
* xterm.h (x_check_errors): Add ATTRIBUTE_FORMAT_PRINTF.
2011-08-30 Chong Yidong <cyd@stupidchicken.com>
* syntax.c (find_defun_start): Update all cache variables if
exiting early (Bug#9401).
2011-08-30 Eli Zaretskii <eliz@gnu.org>
* image.c (x_bitmap_pixmap): Cast to int to avoid compiler warnings.

5
src/syntax.c
View file

@ -398,7 +398,12 @@ find_defun_start (EMACS_INT pos, EMACS_INT pos_byte)
if (!open_paren_in_column_0_is_defun_start)
{
find_start_value = BEGV;
find_start_value_byte = BEGV_BYTE;
find_start_buffer = current_buffer;
find_start_modiff = MODIFF;
find_start_begv = BEGV;
find_start_pos = pos;
return BEGV;
}