merge trunk

This commit is contained in:
Kenichi Handa 2012-02-02 09:32:12 +09:00
commit 159462d4d1
39 changed files with 1136 additions and 856 deletions

View file

@ -1,3 +1,17 @@
2012-02-01 Paul Eggert <eggert@cs.ucla.edu>
Port to older Solaris 10 versions (Bug#10677).
Bug reported by Chong Yidong for SunOS 5.10 Generic_127111-11 sparc.
I cannot reproduce it on SunOS 5.10 Generic_141444-09 sparc but
possibly this is because Sun fixed the 'stat' bug in my version.
* Makefile.in (GNULIB_TOOL_FLAGS): Do not avoid the pathmax module.
* lib/pathmax.h, m4/pathmax.m4: New files, from gnulib.
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
These changes are based on gnulib version
4f11d6bebc3098c64ffde27079ab0d0cecfd0cdc dated 2011-10-07 20:59:10,
because Emacs is in feature freeze and we do not want to merge any
more-recent changes from gnulib.
2012-01-31 Glenn Morris <rgm@gnu.org>
* configure.in: Throw an explicit error if Motif toolkit was

View file

@ -341,7 +341,7 @@ GNULIB_MODULES = \
mktime pthread_sigmask readlink \
socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
GNULIB_TOOL_FLAGS = \
--avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax \
--avoid=msvc-inval --avoid=msvc-nothrow \
--avoid=raise --avoid=threadlib \
--conditional-dependencies --import --no-changelog --no-vc-files \
--makefile-name=gnulib.mk

View file

@ -36,7 +36,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
@ -72,7 +72,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/longlong.m4 \
$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/md5.m4 \
$(top_srcdir)/m4/mktime.m4 $(top_srcdir)/m4/multiarch.m4 \
$(top_srcdir)/m4/nocrash.m4 \
$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/pathmax.m4 \
$(top_srcdir)/m4/pthread_sigmask.m4 \
$(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/sha1.m4 \
$(top_srcdir)/m4/sha256.m4 $(top_srcdir)/m4/sha512.m4 \
@ -795,8 +795,8 @@ EXTRA_DIST = alloca.in.h allocator.h careadlinkat.h md5.h sha1.h \
sha256.h sha512.h dosname.h ftoastr.c ftoastr.h dup2.c \
filemode.h getloadavg.c getopt.c getopt.in.h getopt1.c \
getopt_int.h ignore-value.h intprops.h inttypes.in.h lstat.c \
mktime-internal.h mktime.c pthread_sigmask.c readlink.c \
signal.in.h sigprocmask.c \
mktime-internal.h mktime.c pathmax.h pthread_sigmask.c \
readlink.c signal.in.h sigprocmask.c \
$(top_srcdir)/build-aux/snippet/_Noreturn.h \
$(top_srcdir)/build-aux/snippet/arg-nonnull.h \
$(top_srcdir)/build-aux/snippet/c++defs.h \

1
autogen/aclocal.m4 vendored
View file

@ -1003,6 +1003,7 @@ m4_include([m4/md5.m4])
m4_include([m4/mktime.m4])
m4_include([m4/multiarch.m4])
m4_include([m4/nocrash.m4])
m4_include([m4/pathmax.m4])
m4_include([m4/pthread_sigmask.m4])
m4_include([m4/readlink.m4])
m4_include([m4/sha1.m4])

38
autogen/configure vendored
View file

@ -620,6 +620,8 @@ gl_GNULIB_ENABLED_stat_FALSE
gl_GNULIB_ENABLED_stat_TRUE
gl_GNULIB_ENABLED_sigprocmask_FALSE
gl_GNULIB_ENABLED_sigprocmask_TRUE
gl_GNULIB_ENABLED_pathmax_FALSE
gl_GNULIB_ENABLED_pathmax_TRUE
gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE
gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE
gl_GNULIB_ENABLED_dosname_FALSE
@ -6959,6 +6961,7 @@ esac
# Code from module mktime:
# Code from module multiarch:
# Code from module nocrash:
# Code from module pathmax:
# Code from module pthread_sigmask:
# Code from module readlink:
# Code from module signal-h:
@ -12190,6 +12193,14 @@ $as_echo "$emacs_cv_lesstif" >&6; }
CPPFLAGS=$OLD_CPPFLAGS
fi
fi
ac_fn_c_check_header_mongrel "$LINENO" "Xm/BulletinB.h" "ac_cv_header_Xm_BulletinB_h" "$ac_includes_default"
if test "x$ac_cv_header_Xm_BulletinB_h" = x""yes; then :
else
as_fn_error "Motif toolkit requested but requirements not found." "$LINENO" 5
fi
fi
@ -12201,7 +12212,7 @@ if test "${with_toolkit_scroll_bars}" != "no"; then
HAVE_XAW3D=no
USE_TOOLKIT_SCROLL_BARS=yes
elif test "${HAVE_XAW3D}" = "yes"; then
elif test "${HAVE_XAW3D}" = "yes" || test "${USE_X_TOOLKIT}" = "LUCID"; then
$as_echo "#define USE_TOOLKIT_SCROLL_BARS 1" >>confdefs.h
USE_TOOLKIT_SCROLL_BARS=yes
@ -21802,6 +21813,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
gl_gnulib_enabled_dosname=false
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
gl_gnulib_enabled_pathmax=false
gl_gnulib_enabled_sigprocmask=false
gl_gnulib_enabled_stat=false
gl_gnulib_enabled_strtoll=false
@ -21821,6 +21833,15 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=true
fi
}
func_gl_gnulib_m4code_pathmax ()
{
if ! $gl_gnulib_enabled_pathmax; then
gl_gnulib_enabled_pathmax=true
fi
}
func_gl_gnulib_m4code_sigprocmask ()
{
if ! $gl_gnulib_enabled_sigprocmask; then
@ -21999,6 +22020,9 @@ fi
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_dosname
fi
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_pathmax
fi
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_verify
fi
@ -22158,6 +22182,14 @@ else
gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE=
fi
if $gl_gnulib_enabled_pathmax; then
gl_GNULIB_ENABLED_pathmax_TRUE=
gl_GNULIB_ENABLED_pathmax_FALSE='#'
else
gl_GNULIB_ENABLED_pathmax_TRUE='#'
gl_GNULIB_ENABLED_pathmax_FALSE=
fi
if $gl_gnulib_enabled_sigprocmask; then
gl_GNULIB_ENABLED_sigprocmask_TRUE=
gl_GNULIB_ENABLED_sigprocmask_FALSE='#'
@ -22656,6 +22688,10 @@ if test -z "${gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE}" && test
as_fn_error "conditional \"gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_pathmax_TRUE}" && test -z "${gl_GNULIB_ENABLED_pathmax_FALSE}"; then
as_fn_error "conditional \"gl_GNULIB_ENABLED_pathmax\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_sigprocmask_TRUE}" && test -z "${gl_GNULIB_ENABLED_sigprocmask_FALSE}"; then
as_fn_error "conditional \"gl_GNULIB_ENABLED_sigprocmask\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5

View file

@ -13,7 +13,7 @@
* buffers.texi (Select Buffer): Clarify explanation of switching
to new buffers. Fix description of next-buffer and
previous-buffer (Bug#10334).
previous-buffer (Bug#10334).
(Misc Buffer): Add xref to View Mode.
* text.texi (Fill Commands): Fix description of

View file

@ -1,7 +1,7 @@
2012-01-28 Andreas Schwab <schwab@linux-m68k.org>
* emacs-lisp-intro.texi (Top): Move setting of COUNT-WORDS outside
of @menu. (Bug#10628)
of @menu. (Bug#10628)
2012-01-19 Juanma Barranquero <lekktu@gmail.com>

View file

@ -1,3 +1,8 @@
2012-02-01 Glenn Morris <rgm@gnu.org>
* modes.texi (Defining Minor Modes):
Mention disabling global minor modes on a per-major-mode basis.
2012-01-31 Chong Yidong <cyd@gnu.org>
* syntax.texi (Parsing Expressions): Clarify intro (Bug#10657).

View file

@ -1521,8 +1521,15 @@ starts, for example by providing a @code{:require} keyword.
Use @code{:group @var{group}} in @var{keyword-args} to specify the
custom group for the mode variable of the global minor mode.
Generally speaking, when you define a globalized minor mode, you should
also define a non-globalized version, so that people can use (or
disable) it in individual buffers. This also allows them to disable a
globally enabled minor mode in a specific major mode, by using that
mode's hook.
@end defmac
@node Mode Line Format
@section Mode-Line Format
@cindex mode line

View file

@ -1,3 +1,8 @@
2012-01-30 Philipp Haselwarter <philipp.haselwarter@gmx.de> (tiny change)
* gnus.texi (Agent Basics): Fix outdated description of
`gnus-agent-auto-agentize-methods'.
2012-01-28 Andreas Schwab <schwab@linux-m68k.org>
* cc-mode.texi: Always @defindex ss.

View file

@ -1290,8 +1290,10 @@ on-the-fly spell checking for comments and strings.
*** New hook `change-major-mode-after-body-hook', run by
`run-mode-hooks' just before any other mode hooks.
*** Enabled globalized minor modes can be disabled in specific modes,
by running (FOO-mode-hook 0) via a mode hook.
+++
*** Enabled globalized minor modes can be disabled in specific major modes.
If the global mode is global-FOO-mode, then run (FOO-mode -1) in the
major mode's hook, where FOO-mode toggles the mode on a per-buffer basis.
+++
*** `define-minor-mode' accepts a new keyword :variable.

View file

@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dup2 filemode getloadavg getopt-gnu ignore-value intprops lstat mktime pthread_sigmask readlink socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat
MOSTLYCLEANFILES += core *.stackdump
@ -258,6 +258,15 @@ EXTRA_libgnu_a_SOURCES += mktime.c
## end gnulib module mktime
## begin gnulib module pathmax
if gl_GNULIB_ENABLED_pathmax
endif
EXTRA_DIST += pathmax.h
## end gnulib module pathmax
## begin gnulib module pthread_sigmask

84
lib/pathmax.h Normal file
View file

@ -0,0 +1,84 @@
/* Define PATH_MAX somehow. Requires sys/types.h.
Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2011 Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifndef _PATHMAX_H
# define _PATHMAX_H
/* POSIX:2008 defines PATH_MAX to be the maximum number of bytes in a filename,
including the terminating NUL byte.
<http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html>
PATH_MAX is not defined on systems which have no limit on filename length,
such as GNU/Hurd.
This file does *not* define PATH_MAX always. Programs that use this file
can handle the GNU/Hurd case in several ways:
- Either with a package-wide handling, or with a per-file handling,
- Either through a
#ifdef PATH_MAX
or through a fallback like
#ifndef PATH_MAX
# define PATH_MAX 8192
#endif
or through a fallback like
#ifndef PATH_MAX
# define PATH_MAX pathconf ("/", _PC_PATH_MAX)
#endif
*/
# include <unistd.h>
# include <limits.h>
# ifndef _POSIX_PATH_MAX
# define _POSIX_PATH_MAX 256
# endif
/* Don't include sys/param.h if it already has been. */
# if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
# include <sys/param.h>
# endif
# if !defined PATH_MAX && defined MAXPATHLEN
# define PATH_MAX MAXPATHLEN
# endif
# ifdef __hpux
/* On HP-UX, PATH_MAX designates the maximum number of bytes in a filename,
*not* including the terminating NUL byte, and is set to 1023.
Additionally, when _XOPEN_SOURCE is defined to 500 or more, PATH_MAX is
not defined at all any more. */
# undef PATH_MAX
# define PATH_MAX 1024
# endif
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
/* The page "Naming Files, Paths, and Namespaces" on msdn.microsoft.com,
section "Maximum Path Length Limitation",
<http://msdn.microsoft.com/en-us/library/aa365247(v=vs.85).aspx#maxpath>
explains that the maximum size of a filename, including the terminating
NUL byte, is 260 = 3 + 256 + 1.
This is the same value as
- FILENAME_MAX in <stdio.h>,
- _MAX_PATH in <stdlib.h>,
- MAX_PATH in <windef.h>.
Undefine the original value, because mingw's <limits.h> gets it wrong. */
# undef PATH_MAX
# define PATH_MAX 260
# endif
#endif /* _PATHMAX_H */

View file

@ -1,8 +1,32 @@
2012-02-01 Kenichi Handa <handa@m17n.org>
2012-02-02 Kenichi Handa <handa@m17n.org>
* composite.el (compose-region, compose-string): Signal error for
a null string component (Bug#6988).
2012-02-01 Chong Yidong <cyd@gnu.org>
* view.el (view-buffer-other-window, view-buffer-other-frame):
Handle special modes like view-buffer (Bug#10650).
(view-buffer): Simplify.
* frame.el (set-frame-font): Tweak meaning of third argument.
* dynamic-setting.el (font-setting-change-default-font): Use
set-frame-font (Bug#9982).
2012-02-01 Glenn Morris <rgm@gnu.org>
* progmodes/compile.el (compilation-internal-error-properties):
Respect compilation-first-column in the "*compilation*" buffer.
* emacs-lisp/easy-mmode.el (define-minor-mode):
Relax :variable's test for a named function.
2012-01-31 Alan Mackenzie <acm@muc.de>
* progmodes/cc-engine.el (c-guess-basic-syntax): CASE 5B.1: Fix an
off by one error.
2012-01-31 Chong Yidong <cyd@gnu.org>
* frame.el (set-frame-font): New arg ALL-FRAMES.
@ -74,8 +98,8 @@
* progmodes/python.el: Require ansi-color at top-level.
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-abbrev-table): Define
and use in Emacs Lisp mode (Bug#9360).
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-abbrev-table):
Define and use in Emacs Lisp mode (Bug#9360).
(lisp-mode-abbrev-table): Add doc.
(lisp-mode-variables): Don't set local-abbrev-table.
(lisp-interaction-mode): Use emacs-lisp-mode-abbrev-table.
@ -189,8 +213,8 @@
2012-01-25 Jérémy Compostella <jeremy.compostella@gmail.com>
* window.el (window--state-get-1, window--state-put-2): Don't
save and restore the mark.
* window.el (window--state-get-1, window--state-put-2):
Don't save and restore the mark.
2012-01-25 Chong Yidong <cyd@gnu.org>
@ -537,7 +561,7 @@
first prompt in `sql-interacive-mode'.
(sql-mode-oracle-font-lock-keywords): Add CONNECT_BY_* builtin
keywords.
(sql-mode-mysql-font-lock-keywords): Add ELSEIF keyword.
(sql-mode-mysql-font-lock-keywords): Add ELSEIF keyword.
(sql-product-interactive): Bug fix: Set `sql-buffer' in
context of original buffer. Invoke `sql-login-hook'.
@ -4051,7 +4075,7 @@
* cus-start.el (all): Add entry for bidi-paragraph-direction.
* international/uni-bidi.el: Regenerated.
* international/uni-bidi.el: Regenerate.
2011-08-23 Kenichi Handa <handa@m17n.org>

View file

@ -42,45 +42,28 @@ If DISPLAY-OR-FRAME is a frame, the display is the one for that frame.
If SET-FONT is non-nil, change the font for frames. Otherwise re-apply the
current form for the frame (i.e. hinting or somesuch changed)."
(let ((new-font (and (fboundp 'font-get-system-font)
(font-get-system-font))))
(when new-font
;; Be careful here: when set-face-attribute is called for the
;; :font attribute, Emacs tries to guess the best matching font
;; by examining the other face attributes (Bug#2476).
(font-get-system-font)))
(frame-list (frames-on-display-list display-or-frame)))
(when (and new-font (display-graphic-p display-or-frame))
(clear-font-cache)
;; Set for current frames. Only change font for those that have
;; the old font now. If they don't have the old font, the user
;; probably changed it.
(dolist (f (frames-on-display-list display-or-frame))
(if (display-graphic-p f)
(let* ((frame-font
(or (font-get (face-attribute 'default :font f
'default) :user-spec)
(frame-parameter f 'font-parameter)))
(font-to-set
(if set-font new-font
;; else set font again, hinting etc. may have changed.
frame-font)))
(if font-to-set
(progn
(set-frame-parameter f 'font-parameter font-to-set)
(set-face-attribute 'default f
:width 'normal
:weight 'normal
:slant 'normal
:font font-to-set))))))
;; Set for future frames.
(when set-font
;; FIXME: this is not going to play well with Custom themes.
(set-face-attribute 'default t :font new-font)
(let ((spec (list (list t (face-attr-construct 'default)))))
(put 'default 'customized-face spec)
(custom-push-theme 'theme-face 'default 'user 'set spec)
(put 'default 'face-modified nil))))))
(if set-font
;; Set the font on all current and future frames, as though
;; the `default' face had been "set for this session":
(set-frame-font new-font nil frame-list)
;; Just redraw the existing fonts on all frames:
(dolist (f frame-list)
(let ((frame-font
(or (font-get (face-attribute 'default :font f 'default)
:user-spec)
(frame-parameter f 'font-parameter))))
(when frame-font
(set-frame-parameter f 'font-parameter frame-font)
(set-face-attribute 'default f
:width 'normal
:weight 'normal
:slant 'normal
:font frame-font))))))))
(defun dynamic-setting-handle-config-changed-event (event)
"Handle config-changed-event on the display in EVENT.

View file

@ -182,15 +182,9 @@ For example, you could write
(:require (setq require (pop body)))
(:keymap (setq keymap (pop body)))
(:variable (setq variable (pop body))
(setq tmp (cdr-safe variable))
(if (not (or (functionp tmp)
(and tmp
(symbolp tmp)
;; Hack to allow for named functions not within
;; eval-when-compile.
;; Cf define-compilation-mode.
(boundp 'byte-compile-function-environment)
(assq tmp byte-compile-function-environment))))
(if (not (and (setq tmp (cdr-safe variable))
(or (symbolp tmp)
(functionp tmp))))
;; PLACE is not of the form (GET . SET).
(setq mode variable)
(setq mode (car variable))

View file

@ -1053,7 +1053,7 @@ If FRAME is omitted, describe the currently selected frame."
(define-obsolete-function-alias 'set-default-font 'set-frame-font "23.1")
(defun set-frame-font (font-name &optional keep-size all-frames)
(defun set-frame-font (font-name &optional keep-size frames)
"Set the default font to FONT-NAME.
When called interactively, prompt for the name of a font, and use
that font on the selected frame.
@ -1063,9 +1063,10 @@ fixed. If KEEP-SIZE is non-nil (or with a prefix argument), try
to keep the current frame size fixed (in pixels) by adjusting the
number of lines and columns.
If ALL-FRAMES is nil, apply the font to the selected frame only.
If ALL-FRAMES is non-nil, apply the font to all frames; in
addition, alter the user's Customization settings as though the
If FRAMES is nil, apply the font to the selected frame only.
If FRAMES is non-nil, it should be a list of frames to act upon,
or t meaning all graphical frames. Also, if FRAME is non-nil,
alter the user's Customization settings as though the
font-related attributes of the `default' face had been \"set in
this session\", so that the font is applied to future frames."
(interactive
@ -1079,9 +1080,14 @@ this session\", so that the font is applied to future frames."
(list font current-prefix-arg nil)))
(when (stringp font-name)
(let* ((this-frame (selected-frame))
(frames (if all-frames (frame-list) (list this-frame)))
;; FRAMES nil means affect the selected frame.
(frame-list (cond ((null frames)
(list this-frame))
((eq frames t)
(frame-list))
(t frames)))
height width)
(dolist (f frames)
(dolist (f frame-list)
(when (display-multi-font-p f)
(if keep-size
(setq height (* (frame-parameter f 'height)
@ -1099,7 +1105,7 @@ this session\", so that the font is applied to future frames."
f
(list (cons 'height (round height (frame-char-height f)))
(cons 'width (round width (frame-char-width f))))))))
(when all-frames
(when frames
;; Alter the user's Custom setting of the `default' face, but
;; only for font-related attributes.
(let ((specs (cadr (assq 'user (get 'default 'theme-face))))

View file

@ -1,3 +1,25 @@
2012-02-01 Lars Ingebrigtsen <larsi@gnus.org>
* gnus.el (gnus-valid-select-methods): nnmaildir also saves marks in
the "server".
* gnus-group.el (gnus-group-get-new-news-this-group): Don't overwrite
the real error message with the useless "previously known to be down".
Which isn't even correct.
* nntp.el (nntp-open-connection): Report the error message if the nntp
server can't be reached.
* nnimap.el (nnimap-retrieve-group-data-early): Keep track of how many
groups we do a total scan for.
(nnimap-wait-for-response): Say that we're doing a total scan, if we're
doing that.
2012-01-31 Jim Meyering <jim@meyering.net>
* gnus-agent.el (gnus-agent-expire-unagentized-dirs):
Correct a comment (insert "not") and hide nominally-doubled "to".
2012-01-30 Philipp Haselwarter <philipp.haselwarter@gmx.de> (tiny change)
* gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent
@ -7153,7 +7175,7 @@
"failed" all the time.
* gnus.el: Throughout all files, replace (save-excursion (set-buffer
...)) with (with-current-buffer ... ).
...)) with (with-current-buffer ...).
* nntp.el (nntp-open-server): Return whether the open was successful or
not.

View file

@ -3618,7 +3618,7 @@ articles in every agentized group? "))
(setq r d
d (directory-file-name d)))
;; if ANY ancestor was NOT in keep hash and
;; it's already in to-remove, add it to
;; it's not already in to-remove, add it to
;; to-remove.
(if (and r
(not (member r to-remove)))

View file

@ -4070,10 +4070,7 @@ If DONT-SCAN is non-nil, scan non-activated groups as well."
(gnus-agent-save-group-info
method (gnus-group-real-name group) active))
(gnus-group-update-group group nil t))
(if (eq (gnus-server-status (gnus-find-method-for-group group))
'denied)
(gnus-error 3 "Server previously determined to be down; not retrying")
(gnus-error 3 "%s error: %s" group (gnus-status-message group)))))
(gnus-error 3 "%s error: %s" group (gnus-status-message group))))
(when beg
(goto-char beg))
(when gnus-goto-next-group-when-activating

View file

@ -1626,7 +1626,7 @@ slower."
("nnagent" post-mail)
("nnimap" post-mail address prompt-address physical-address respool
server-marks)
("nnmaildir" mail respool address)
("nnmaildir" mail respool address server-marks)
("nnnil" none))
"*An alist of valid select methods.
The first element of each list lists should be a string with the name

View file

@ -134,7 +134,7 @@ textual parts.")
(defstruct nnimap
group process commands capabilities select-result newlinep server
last-command-time greeting examined stream-type)
last-command-time greeting examined stream-type initial-resync)
(defvar nnimap-object nil)
@ -288,7 +288,8 @@ textual parts.")
(gnus-add-buffer)
(set (make-local-variable 'after-change-functions) nil)
(set (make-local-variable 'nnimap-object)
(make-nnimap :server (nnoo-current-server 'nnimap)))
(make-nnimap :server (nnoo-current-server 'nnimap)
:initial-resync 0))
(push (list buffer (current-buffer)) nnimap-connection-alist)
(push (current-buffer) nnimap-process-buffers)
(current-buffer)))
@ -1218,6 +1219,7 @@ textual parts.")
(with-current-buffer (nnimap-buffer)
(erase-buffer)
(setf (nnimap-group nnimap-object) nil)
(setf (nnimap-initial-resync nnimap-object) 0)
(let ((qresyncp (nnimap-capability "QRESYNC"))
params groups sequences active uidvalidity modseq group)
;; Go through the infos and gather the data needed to know
@ -1256,6 +1258,8 @@ textual parts.")
;; examine), but will tell us whether the group
;; is read-only or not.
"SELECT")))
(setf (nnimap-initial-resync nnimap-object)
(1+ (nnimap-initial-resync nnimap-object)))
(push (list (nnimap-send-command "%s %S" command
(utf7-encode group t))
(nnimap-send-command "UID FETCH %d:* FLAGS" start)
@ -1738,10 +1742,15 @@ textual parts.")
(not (looking-at (format "%d .*\n" sequence)))))
(when messagep
(nnheader-message-maybe
7 "nnimap read %dk from %s" (/ (buffer-size) 1000)
nnimap-address))
7 "nnimap read %dk from %s%s" (/ (buffer-size) 1000)
nnimap-address
(if (not (zerop (nnimap-initial-resync nnimap-object)))
(format " (initial sync of %d groups; please wait)"
(nnimap-initial-resync nnimap-object))
"")))
(nnheader-accept-process-output process)
(goto-char (point-max)))
(setf (nnimap-initial-resync nnimap-object) 0)
openp)
(quit
(when debug-on-quit

View file

@ -1385,6 +1385,10 @@ password contained in '~/.nntp-authinfo'."
(nnheader-cancel-timer timer))
(when (and process
(not (memq (process-status process) '(open run))))
(with-current-buffer pbuffer
(goto-char (point-min))
(nnheader-report 'nntp "Error when connecting: %s"
(buffer-substring (point) (line-end-position))))
(setq process nil))
(unless process
(nntp-kill-buffer pbuffer))

File diff suppressed because it is too large Load diff

View file

@ -52,7 +52,7 @@
pop-to-buffer-same-window.
* mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder)
(mh-make-folder): Call mh-pop-to-buffer-same-window instead of
switch-to-buffer. The previous change which used pop-to-buffer
switch-to-buffer. The previous change which used pop-to-buffer
produced the wrong behavior.
2011-07-12 Henrique Martins <henrique@martins.cc> (tiny change)
@ -73,8 +73,8 @@
* mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder)
(mh-make-folder): Replace calls to switch-to-buffer with of
pop-to-buffer. The former is intended for interactive use only and
generates warnings in Emacs 24.
pop-to-buffer. The former is intended for interactive use only
and generates warnings in Emacs 24.
2011-07-09 Bill Wohler <wohler@newt.com>
@ -96,7 +96,7 @@
* mh-e.el: Just require mh-loaddefs since loading it in an
eval-and-compile block causes compilation errors in XEmacs.
* mh-acros.el, mh-comp.el, mh-e.el, mh-folder.el, mh-letter.el:
* mh-acros.el, mh-comp.el, mh-e.el, mh-folder.el, mh-letter.el:
* mh-mime.el, mh-search.el, mh-seq.el: Shush XEmacs compiler in
mh-do-in-xemacs block.
@ -107,7 +107,7 @@
* mh-letter.el (mh-letter-mode-map, mh-letter-complete)
(mh-complete-word): Remove FIXME comments since these functions
are still needed in other Emacsen. However, they can probably
are still needed in other Emacsen. However, they can probably
stand to be generalized like completion-at-point.
(mh-letter-complete-or-space): Remove unused variable.
@ -173,7 +173,7 @@
2010-05-14 Peter S Galbraith <psg@debian.org>
* mh-mime.el (mh-decode-message-subject): New function to decode
RFC2047 encoded Subject lines. Used for reply drafts.
RFC2047 encoded Subject lines. Used for reply drafts.
* mh-comp.el (mh-compose-and-send-mail): Call
`mh-decode-message-subject' on (reply or forward) message drafts.

View file

@ -924,8 +924,8 @@
2012-01-03 Matt Lundin <mdl@imapmail.org>
* org-agenda.el: (org-class): Fix holidays symbol in
org-class. This was resulting in an "Bad sexp..." warning.
* org-agenda.el (org-class): Fix holidays symbol in org-class.
This was resulting in an "Bad sexp..." warning.
2012-01-03 Carsten Dominik <carsten.dominik@gmail.com>
@ -968,13 +968,13 @@
2012-01-03 Eric Schulte <schulte.eric@gmail.com>
* ob-sql.el (org-babel-header-arg-names:sql): Sql specific header
* ob-sql.el (org-babel-header-arg-names:sql): SQL specific header
argument names which should be inherited.
2012-01-03 Nicolas Goaziou <n.goaziou@gmail.com>
* org.el (org-in-block-p): Return matched name of block, if
any. It can be useful when a list of block names is provided as
* org.el (org-in-block-p): Return matched name of block, if any.
It can be useful when a list of block names is provided as
an argument.
2012-01-03 Nicolas Goaziou <n.goaziou@gmail.com>
@ -1038,10 +1038,10 @@
* org-exp.el (org-export-protect-quoted-subtrees): More accurate
regexp. Also use new regexp to match generic headlines.
* org-html.el (org-export-as-html): More accurate regexp. Also
use new regexp to match generic headlines.
* org-html.el (org-export-as-html): More accurate regexp.
Also use new regexp to match generic headlines.
* org-mouse.el (org-mouse-match-todo-keyword): Removed unused
* org-mouse.el (org-mouse-match-todo-keyword): Remove unused
and now erroneous function.
* org.el (org-heading-regexp, org-heading-keyword-regexp-format):
@ -1071,8 +1071,8 @@
2012-01-03 David Maus <dmaus@ictsoc.de>
* org.el (org-loop-over-headlines-in-active-region): New
customization variable. Loop over headlines in active region.
* org.el (org-loop-over-headlines-in-active-region):
New customization variable. Loop over headlines in active region.
(org-schedule, org-deadline): Apply to headlines in region depending
on new customization variable.
@ -1092,8 +1092,8 @@
2012-01-03 Bastien Guerry <bzg@gnu.org>
* org.el (org-format-agenda-item, org-scan-tags): Rename
`org-format-agenda-item' to `org-agenda-format-item'.
* org.el (org-format-agenda-item, org-scan-tags):
Rename `org-format-agenda-item' to `org-agenda-format-item'.
2012-01-03 Bastien Guerry <bzg@gnu.org>

View file

@ -9447,7 +9447,7 @@ comment at the start of cc-engine.el for more info."
;; CASE 5B.1: Member init list.
((eq (char-after tmp-pos) ?:)
(if (or (> tmp-pos indent-point)
(if (or (>= tmp-pos indent-point)
(= (c-point 'bosws) (1+ tmp-pos)))
(progn
;; There is no preceding member init clause.

View file

@ -1058,6 +1058,7 @@ FMTS is a list of format specs for transforming the file name.
(marker
(if marker-line (compilation--loc->marker (cadr marker-line))))
(screen-columns compilation-error-screen-columns)
(first-column compilation-first-column)
end-marker loc end-loc)
(if (not (and marker (marker-buffer marker)))
(setq marker nil) ; no valid marker for this file
@ -1078,7 +1079,10 @@ FMTS is a list of format specs for transforming the file name.
;; Obey the compilation-error-screen-columns of the target
;; buffer if its major mode set it buffer-locally.
(if (local-variable-p 'compilation-error-screen-columns)
compilation-error-screen-columns screen-columns)))
compilation-error-screen-columns screen-columns))
(compilation-first-column
(if (local-variable-p 'compilation-first-column)
compilation-first-column first-column)))
(save-excursion
(save-restriction
(widen)

View file

@ -1,6 +1,6 @@
;;; gdb-mi.el --- User Interface for running GDB
;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
;; Copyright (C) 2007-2012 Free Software Foundation, Inc.
;; Author: Nick Roberts <nickrob@gnu.org>
;; Maintainer: FSF
@ -26,7 +26,7 @@
;;; Credits:
;; This file was written by Nick Roberts following the general design
;; used in gdb-ui.el for Emacs 22.1 - 23.1. It is currently being developed
;; used in gdb-ui.el for Emacs 22.1 - 23.1. It was further developed
;; by Dmitry Dzhus <dima@sphinx.net.ru> as part of the Google Summer
;; of Code 2009 Project "Emacs GDB/MI migration".
@ -45,7 +45,7 @@
;; This file uses GDB/MI as the primary interface to GDB. It runs gdb with
;; GDB/MI (-interp=mi) and access CLI using "-interpreter-exec console
;; cli-command". This code works without gdb-ui.el and uses MI tokens instead
;; cli-command". This code replaces gdb-ui.el and uses MI tokens instead
;; of queues. Eventually MI should be asynchronous.
;; Windows Platforms:

View file

@ -86,16 +86,15 @@
2011-05-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
* url-queue.el: New file.
(url-queue-run-queue): Pick the first waiting job, and not the
last.
(url-queue-run-queue): Pick the first waiting job, and not the last.
(url-queue-parallel-processes): Lower the concurrency level, since
Emacs doesn't seem to like too many async processes.
(url-queue-prune-old-entries): Fix up the pruning code.
2011-04-16 Lars Magne Ingebrigtsen <larsi@gnus.org>
* url-http.el (url-http-wait-for-headers-change-function): Protect
against malformed headerless responses from servers.
* url-http.el (url-http-wait-for-headers-change-function):
Protect against malformed headerless responses from servers.
2011-04-02 Chong Yidong <cyd@stupidchicken.com>
@ -123,9 +122,9 @@
2011-02-03 Lars Ingebrigtsen <larsi@gnus.org>
* url-http.el (url-http-wait-for-headers-change-function): Don't
move point if the callback function has moved changed/killed the
process buffer.
* url-http.el (url-http-wait-for-headers-change-function):
Don't move point if the callback function has moved/changed/killed
the process buffer.
2010-12-16 Miles Bader <miles@gnu.org>
@ -198,8 +197,8 @@
2010-10-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
* url-cookie.el (url-cookie-handle-set-cookie): Use
url-lazy-message for the cookie warning, which isn't very interesting.
* url-cookie.el (url-cookie-handle-set-cookie): Use url-lazy-message
for the cookie warning, which isn't very interesting.
* url-http.el (url-http-async-sentinel): Check that the buffer is
still alive before switching to it.
@ -265,13 +264,13 @@
2010-07-01 Mark A. Hershberger <mah@everybody.org>
* url-http.el (url-http-create-request): Add a CRLF on the end so
that POSTs with content to https urls work.
that POSTs with content to https URLs work.
See <https://bugs.launchpad.net/mediawiki-el/+bug/540759>
2010-06-22 Mark A. Hershberger <mah@everybody.org>
* url-parse.el (url-user-for-url, url-password-for-url):
Convenience functions that get usernames and passwords for urls
Convenience functions that get usernames and passwords for URLs
from auth-source functions.
2010-06-12 Štěpán Němec <stepnem@gmail.com> (tiny change)

View file

@ -311,13 +311,9 @@ file: Users may suspend viewing in order to modify the buffer.
Exiting View mode will then discard the user's edits. Setting
EXIT-ACTION to `kill-buffer-if-not-modified' avoids this."
(interactive "bView buffer: ")
(if (eq (with-current-buffer buffer
(get major-mode 'mode-class))
'special)
(progn
(switch-to-buffer buffer)
(message "Not using View mode because the major mode is special"))
(switch-to-buffer buffer)
(switch-to-buffer buffer)
(if (eq (get major-mode 'mode-class) 'special)
(message "Not using View mode because the major mode is special")
(view-mode-enter nil exit-action)))
;;;###autoload
@ -339,7 +335,9 @@ this argument instead of explicitly setting `view-exit-action'."
(interactive "bIn other window view buffer:\nP")
(let ((pop-up-windows t))
(pop-to-buffer buffer t))
(view-mode-enter nil exit-action))
(if (eq (get major-mode 'mode-class) 'special)
(message "Not using View mode because the major mode is special")
(view-mode-enter nil exit-action)))
;;;###autoload
(defun view-buffer-other-frame (buffer &optional not-return exit-action)
@ -360,7 +358,9 @@ this argument instead of explicitly setting `view-exit-action'."
(interactive "bView buffer in other frame: \nP")
(let ((pop-up-frames t))
(pop-to-buffer buffer t))
(view-mode-enter nil exit-action))
(if (eq (get major-mode 'mode-class) 'special)
(message "Not using View mode because the major mode is special")
(view-mode-enter nil exit-action)))
;;;###autoload
(define-minor-mode view-mode

View file

@ -65,6 +65,7 @@ AC_DEFUN([gl_EARLY],
# Code from module mktime:
# Code from module multiarch:
# Code from module nocrash:
# Code from module pathmax:
# Code from module pthread_sigmask:
# Code from module readlink:
# Code from module signal-h:
@ -217,6 +218,7 @@ AC_REQUIRE([AC_C_INLINE])
gl_UNISTD_H
gl_gnulib_enabled_dosname=false
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
gl_gnulib_enabled_pathmax=false
gl_gnulib_enabled_sigprocmask=false
gl_gnulib_enabled_stat=false
gl_gnulib_enabled_strtoll=false
@ -236,6 +238,13 @@ AC_SUBST([LTLIBINTL])
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=true
fi
}
func_gl_gnulib_m4code_pathmax ()
{
if ! $gl_gnulib_enabled_pathmax; then
gl_PATHMAX
gl_gnulib_enabled_pathmax=true
fi
}
func_gl_gnulib_m4code_sigprocmask ()
{
if ! $gl_gnulib_enabled_sigprocmask; then
@ -261,6 +270,9 @@ gl_SYS_STAT_MODULE_INDICATOR([stat])
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_dosname
fi
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_pathmax
fi
if test $REPLACE_STAT = 1; then
func_gl_gnulib_m4code_verify
fi
@ -326,6 +338,7 @@ gl_STDLIB_MODULE_INDICATOR([strtoull])
m4_pattern_allow([^gl_GNULIB_ENABLED_])
AM_CONDITIONAL([gl_GNULIB_ENABLED_dosname], [$gl_gnulib_enabled_dosname])
AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36])
AM_CONDITIONAL([gl_GNULIB_ENABLED_pathmax], [$gl_gnulib_enabled_pathmax])
AM_CONDITIONAL([gl_GNULIB_ENABLED_sigprocmask], [$gl_gnulib_enabled_sigprocmask])
AM_CONDITIONAL([gl_GNULIB_ENABLED_stat], [$gl_gnulib_enabled_stat])
AM_CONDITIONAL([gl_GNULIB_ENABLED_strtoll], [$gl_gnulib_enabled_strtoll])
@ -502,6 +515,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/md5.h
lib/mktime-internal.h
lib/mktime.c
lib/pathmax.h
lib/pthread_sigmask.c
lib/readlink.c
lib/sha1.c
@ -552,6 +566,7 @@ AC_DEFUN([gl_FILE_LIST], [
m4/mktime.m4
m4/multiarch.m4
m4/nocrash.m4
m4/pathmax.m4
m4/pthread_sigmask.m4
m4/readlink.m4
m4/sha1.m4

42
m4/pathmax.m4 Normal file
View file

@ -0,0 +1,42 @@
# pathmax.m4 serial 10
dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_PATHMAX],
[
dnl Prerequisites of lib/pathmax.h.
AC_CHECK_HEADERS_ONCE([sys/param.h])
])
# Expands to a piece of C program that defines PATH_MAX in the same way as
# "pathmax.h" will do.
AC_DEFUN([gl_PATHMAX_SNIPPET], [[
/* Arrange to define PATH_MAX, like "pathmax.h" does. */
#if HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <limits.h>
#if defined HAVE_SYS_PARAM_H && !defined PATH_MAX && !defined MAXPATHLEN
# include <sys/param.h>
#endif
#if !defined PATH_MAX && defined MAXPATHLEN
# define PATH_MAX MAXPATHLEN
#endif
#ifdef __hpux
# undef PATH_MAX
# define PATH_MAX 1024
#endif
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
# undef PATH_MAX
# define PATH_MAX 260
#endif
]])
# Prerequisites of gl_PATHMAX_SNIPPET.
AC_DEFUN([gl_PATHMAX_SNIPPET_PREREQ],
[
AC_CHECK_HEADERS_ONCE([unistd.h sys/param.h])
])

View file

@ -642,7 +642,7 @@
b-emacs.exe to 3072K.
* mainmake.v2 (emacs lispref lispintro): Chdir under doc/.
(emacs): Renamed from `man', to reflect changes in doc directory
(emacs): Rename from `man', to reflect changes in doc directory
structure. All callers changed.
(clean mostlyclean distclean maintainer-clean extraclean): Chdir
into doc/ for manuals. Add misc subdirectory.
@ -1097,7 +1097,7 @@
1996-08-04 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
* is_exec.c: Renamed from is-exec.c.
* is_exec.c: Rename from is-exec.c.
1996-07-27 Richard Stallman <rms@psilocin.gnu.ai.mit.edu>
@ -1132,7 +1132,7 @@
* mainmake.v2 (src): Create a file with sed commands instead of using
a long sed command line (some versions of Sed don't handle that).
(gdb): Merged back into src, undoing April 13 change.
(gdb): Merge back into src, undoing April 13 change.
(install): Do use if statements, but not a loop.
1996-04-13 Richard Stallman <rms@mole.gnu.ai.mit.edu>

View file

@ -99,8 +99,8 @@
2009-02-01 Adrian Robert <Adrian.B.Robert@gmail.com>
* Cocoa/Emacs.base/Contents/Resources/preferences.nib: Remove
cursor blink slider, add confirm quit checkbox.
* Cocoa/Emacs.base/Contents/Resources/preferences.nib:
Remove cursor blink slider, add confirm quit checkbox.
2009-01-05 Glenn Morris <rgm@gnu.org>

View file

@ -4,8 +4,8 @@
(UINT64_MAX) [_WIN64]: Fix definition.
(uintmax_t, intmax_t): Fix definitions.
* inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]: Provide
correct definitions.
* inc/inttypes.h (strtoumax, strtoimax) [!__MINGW32__]:
Provide correct definitions.
* config.nt (HAVE_DECL_STRTOLL): Define.
(va_copy) [_WIN64]: Provide a better definition.

View file

@ -1,10 +1,17 @@
2012-02-01 Kenichi Handa <handa@m17n.org>
2012-02-02 Kenichi Handa <handa@m17n.org>
* xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to
NULL (Bug#6988).
(x_produce_glyphs): If the component of a composition is a null
string, set it->pixel_width to 1 to avoid zero-width glyph.
2012-02-01 Eli Zaretskii <eliz@gnu.org>
* ralloc.c (resize_bloc, r_alloc_sbrk): Don't call memmove if its
first 2 arguments are identical. This makes inserting large
output from a subprocess an order of magnitude faster on
MS-Windows, where all sbrk'ed memory is always contiguous.
2012-01-31 Glenn Morris <rgm@gnu.org>
* nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
@ -21,7 +28,6 @@
2012-01-28 Chong Yidong <cyd@gnu.org>
* minibuf.c (syms_of_minibuf): Doc fix (Bug#10550).
2012-01-26 Chong Yidong <cyd@gnu.org>
@ -2376,7 +2382,7 @@
Remove unreachable code.
(read_hex, load_charset_map_from_file): Check for integer overflow.
* xterm.c: don't go over XClientMessageEvent limit
* xterm.c: Don't go over XClientMessageEvent limit.
(scroll_bar_windows_size): Now ptrdiff_t, as we prefer signed.
(x_send_scroll_bar_event): Likewise. Check that the size does not
exceed limits imposed by XClientMessageEvent, as well as the usual
@ -5667,7 +5673,7 @@
* ccl.c (ccl_driver): Redo slightly to avoid the need for 'unsigned'.
ccl: add integer overflow checks
ccl: Add integer overflow checks.
* ccl.c (CCL_CODE_MAX, GET_CCL_RANGE, GET_CCL_CODE, GET_CCL_INT):
(IN_INT_RANGE): New macros.
(ccl_driver): Use them to check for integer overflow when

View file

@ -636,7 +636,8 @@ resize_bloc (bloc_ptr bloc, SIZE size)
}
else
{
memmove (b->new_data, b->data, b->size);
if (b->new_data != b->data)
memmove (b->new_data, b->data, b->size);
*b->variable = b->data = b->new_data;
}
}
@ -647,7 +648,8 @@ resize_bloc (bloc_ptr bloc, SIZE size)
}
else
{
memmove (bloc->new_data, bloc->data, old_size);
if (bloc->new_data != bloc->data)
memmove (bloc->new_data, bloc->data, old_size);
memset ((char *) bloc->new_data + old_size, 0, size - old_size);
*bloc->variable = bloc->data = bloc->new_data;
}
@ -663,7 +665,8 @@ resize_bloc (bloc_ptr bloc, SIZE size)
}
else
{
memmove (b->new_data, b->data, b->size);
if (b->new_data != b->data)
memmove (b->new_data, b->data, b->size);
*b->variable = b->data = b->new_data;
}
}
@ -816,7 +819,8 @@ r_alloc_sbrk (long int size)
header. */
for (b = last_bloc; b != NIL_BLOC; b = b->prev)
{
memmove (b->new_data, b->data, b->size);
if (b->new_data != b->data)
memmove (b->new_data, b->data, b->size);
*b->variable = b->data = b->new_data;
}
@ -862,7 +866,8 @@ r_alloc_sbrk (long int size)
for (b = first_bloc; b != NIL_BLOC; b = b->next)
{
memmove (b->new_data, b->data, b->size);
if (b->new_data != b->data)
memmove (b->new_data, b->data, b->size);
*b->variable = b->data = b->new_data;
}
}

View file

@ -7,7 +7,7 @@
* automated/compile-tests.el (compile-tests--test-regexps-data):
Increase column numbers by one to reflect change in how
compilation-message is recorded (Bug#10172).
compilation-message is recorded (Bug#10172).
2011-11-22 Glenn Morris <rgm@gnu.org>
@ -26,7 +26,7 @@
2011-10-30 Ulf Jasper <ulf.jasper@web.de>
* automated/newsticker-tests.el
(newsticker--group-manage-orphan-feeds): Removed fsetting of
(newsticker--group-manage-orphan-feeds): Remove fsetting of
newsticker--treeview-tree-update.
2011-10-29 Ulf Jasper <ulf.jasper@web.de>
@ -63,7 +63,7 @@
(icalendar--format-ical-event)
(icalendar--parse-summary-and-rest)
(icalendar-tests--do-test-import)
(icalendar-tests--do-test-cycle) : Changed argument order of
(icalendar-tests--do-test-cycle): Change argument order of
string= to EXPECTED ACTUAL.
(icalendar--import-format-sample)
(icalendar--format-ical-event)
@ -71,7 +71,7 @@
(icalendar-import-rrule)
(icalendar-import-duration)
(icalendar-import-bug-6766)
(icalendar-real-world): Adjusted to string= instead of
(icalendar-real-world): Adjust to string= instead of
icalendar-tests--compare-strings.
(icalendar-import-multiple-vcalendars): New.
@ -258,8 +258,8 @@
2010-02-19 Ulf Jasper <ulf.jasper@web.de>
* icalendar-testsuite.el
(icalendar-testsuite--run-function-tests): Added new tests.
(icalendar-testsuite--test-diarytime-to-isotime): Added another
(icalendar-testsuite--run-function-tests): Add new tests.
(icalendar-testsuite--test-diarytime-to-isotime): Add another
testcase.
(icalendar-testsuite--test-convert-ordinary-to-ical): New.
(icalendar-testsuite--test-convert-weekly-to-ical): New.
@ -284,14 +284,14 @@
2009-12-18 Ulf Jasper <ulf.jasper@web.de>
* icalendar-testsuite.el
(icalendar-testsuite--run-function-tests): Added
(icalendar-testsuite--run-function-tests): Add
icalendar-testsuite--test-parse-vtimezone.
(icalendar-testsuite--test-parse-vtimezone): New.
(icalendar-testsuite--do-test-cycle): Doc changes.
(icalendar-testsuite--run-real-world-tests): Removed trailing
(icalendar-testsuite--run-real-world-tests): Remove trailing
whitespace -- see change of icalendar--add-diary-entry in
icalendar.el.
(icalendar-testsuite--run-cycle-tests): Re-enabled all tests.
(icalendar-testsuite--run-cycle-tests): Re-enable all tests.
2009-09-30 Glenn Morris <rgm@gnu.org>
@ -312,12 +312,12 @@
2009-01-25 Ulf Jasper <ulf.jasper@web.de>
* icalendar-testsuite.el
(icalendar-testsuite--run-function-tests): Added
icalendar-testsuite--test-diarytime-to-isotime.
(icalendar-testsuite--test-parse-summary-and-rest): Adjusted to
(icalendar-testsuite--run-function-tests):
Add icalendar-testsuite--test-diarytime-to-isotime.
(icalendar-testsuite--test-parse-summary-and-rest): Adjust to
recent icalendar fixes.
(icalendar-testsuite--test-diarytime-to-isotime): New.
(icalendar-testsuite--test-create-uid): Adjusted to recent
(icalendar-testsuite--test-create-uid): Adjust to recent
icalendar changes.
2008-11-30 Shigeru Fukaya <shigeru.fukaya@gmail.com>