Commit 15d73a19 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge emacs-23

parents ea2460a0 29feb0e9
......@@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
See the end of the file for license conditions.
This directory tree holds version 23.2.92 of GNU Emacs, the extensible,
This directory tree holds version 23.2.93 of GNU Emacs, the extensible,
customizable, self-documenting real-time display editor.
The file INSTALL in this directory says how to build and install GNU
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.67 for emacs 23.2.92.
# Generated by GNU Autoconf 2.67 for emacs 23.2.93.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -549,8 +549,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='emacs'
PACKAGE_TARNAME='emacs'
PACKAGE_VERSION='23.2.92'
PACKAGE_STRING='emacs 23.2.92'
PACKAGE_VERSION='23.2.93'
PACKAGE_STRING='emacs 23.2.93'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -1320,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures emacs 23.2.92 to adapt to many kinds of systems.
\`configure' configures emacs 23.2.93 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1394,7 +1394,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of emacs 23.2.92:";;
short | recursive ) echo "Configuration of emacs 23.2.93:";;
esac
cat <<\_ACEOF
......@@ -1540,7 +1540,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
emacs configure 23.2.92
emacs configure 23.2.93
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
......@@ -2091,7 +2091,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by emacs $as_me 23.2.92, which was
It was created by emacs $as_me 23.2.93, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
......@@ -14056,7 +14056,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by emacs $as_me 23.2.92, which was
This file was extended by emacs $as_me 23.2.93, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -14122,7 +14122,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
emacs config.status 23.2.92
emacs config.status 23.2.93
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
......
......@@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License
dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.62)
AC_INIT(emacs, 23.2.92)
AC_INIT(emacs, 23.2.93)
AC_CONFIG_HEADER(src/config.h:src/config.in)
AC_CONFIG_SRCDIR(src/lisp.h)
......
......@@ -5,7 +5,7 @@
@c The edition number appears in several places in this file
@set EDITION Sixteenth
@set EMACSVER 23.2.92
@set EMACSVER 23.2.93
@copying
This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
......
......@@ -11,7 +11,7 @@
@center @titlefont{GNU Emacs Lisp Reference Manual}
@sp 5
@center GNU
@center Emacs Version 23.2.92
@center Emacs Version 23.2.93
@center for Unix Users
@sp 5
......
......@@ -8,7 +8,7 @@
@c Please remember to update the edition number in README as well.
@c And also the copies in vol1.texi and vol2.texi.
@set VERSION 3.0
@set EMACSVER 23.2.92
@set EMACSVER 23.2.93
@set DATE July 2009
@c in general, keep the following line commented out, unless doing a
......
......@@ -27,7 +27,7 @@
@c Version of the manual and of Emacs.
@c Please remember to update the edition number in README as well.
@set VERSION 3.0
@set EMACSVER 23.2.92
@set EMACSVER 23.2.93
@set DATE July 2009
@dircategory Emacs
......
......@@ -27,7 +27,7 @@
@c Version of the manual and of Emacs.
@c Please remember to update the edition number in README as well.
@set VERSION 3.0
@set EMACSVER 23.2.92
@set EMACSVER 23.2.93
@set DATE July 2009
@dircategory Emacs
......
.\" See section COPYING for copyright and redistribution information.
.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.92"
.TH EMACS 1 "2007 April 13" "GNU Emacs 23.2.93"
.
.
.SH NAME
......
......@@ -5,7 +5,7 @@
@c %**end of header
@c This is used in many places
@set VER 23.2.92
@set VER 23.2.93
@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
@c Feel free to install changes without prior permission (but I'd
......
......@@ -216,6 +216,8 @@ Angelo Graziosi: changed sysdep.c term.c
Anna M. Bigatti: wrote cal-html.el
Antoine Levitt: changed erc-track.el
Ari Roponen: changed atimer.c mule.texi startup.el time-date.el
Arisawa Akihiro: changed characters.el coding.c epa-file.el japan-util.el
......@@ -439,8 +441,8 @@ Chong Yidong: wrote redisplay-testsuite.el
and co-wrote longlines.el
and changed xdisp.c simple.el files.el display.texi files.texi
frames.texi emacs.texi xterm.c keyboard.c cus-edit.el faces.el
Makefile.in xfaces.c misc.texi xfns.c font.c image.c startup.el
text.texi compile.el configure.in and 655 other files
Makefile.in font.c xfaces.c image.c misc.texi xfns.c startup.el
text.texi compile.el configure.in and 660 other files
Chris Chase: co-wrote idlw-shell.el idlwave.el
......@@ -772,7 +774,7 @@ and changed complete.el
Denis Stünkel: changed ibuf-ext.el
Deniz Dogan: changed window.el
Deniz Dogan: changed rcirc.el window.el
Dennis Gilmore: changed sparc.h
......@@ -1148,8 +1150,8 @@ Glenn Morris: wrote check-declare.el
and changed Makefile.in calendar.el diary-lib.el rmail.el f90.el
cal-menu.el cal-hebrew.el fortran.el holidays.el configure.in
calendar.texi cal-islam.el bytecomp.el cal-bahai.el appt.el emacs.texi
files.el cal-china.el rmailsum.el cal-tex.el simple.el
and 1011 other files
files.el cal-china.el rmailsum.el simple.el cal-tex.el
and 1012 other files
Glynn Clements: wrote gamegrid.el snake.el tetris.el
......@@ -1386,8 +1388,8 @@ Jared Finder: changed compile.el
Jari Aalto: changed add-log.el filecache.el grep.el gnus-art.el
gnus-sum.el gnus.texi ispell.el lisp-mnt.el man.el nnmail.el apropos.el
autorevert.el comint.el compile.el cperl-mode.el debug.el desktop.el
emacsclient.1 executable.el files.el find-dired.el and 15 other files
autorevert.el checkdoc.el comint.el compile.el cperl-mode.el debug.el
desktop.el emacsclient.1 executable.el files.el and 16 other files
Jason Baker: changed gnus-art.el
......@@ -1778,6 +1780,8 @@ Keiichi Suzuki: changed nntp.el
Keisuke Nishida: changed print.c alloc.c bytecomp.el data.c keymap.c
Keitaro Miyazaki: changed re-builder.el
Keith Gabryelski: wrote hexl.c hexl.el
Ken Brown: changed cygwin.h browse-url.el configure.in dired.c emacs.c
......@@ -2589,7 +2593,8 @@ Peter Kleiweg: wrote ps-mode.el
Peter Liljenberg: wrote elint.el
Peter O'Gorman: changed configure.in frame.h hpux10-20.h termhooks.h
Peter O'Gorman: changed configure.in frame.h hpux10-20.h hpux11.h
termhooks.h
Peter Povinec: changed term.el
......@@ -2712,7 +2717,7 @@ Richard G. Bielawski: changed modes.texi paren.el
Richard Hoskins: changed message.el
Richard Kim: wrote python.el
and changed python-wy.el
and changed loading.texi python-wy.el
Richard King: wrote filelock.c uniquify.el userlock.el
......@@ -2788,7 +2793,7 @@ Roland B. Roberts: changed buffer.h callproc.c dired.c files.el
Roland McGrath: wrote autoload.el etags.el grep.el map-ynp.el
and co-wrote compile.el find-dired.el
and changed add-log.el configure.in files.el Makefile.in vc.el simple.el
mailabbrev.el buffer.c comint.el upd-copyr.el etags.c menu-bar.el
mailabbrev.el comint.el buffer.c upd-copyr.el etags.c menu-bar.el
mem-limits.h ralloc.c fileio.c data.c process.c rlogin.el rmail.el
shell.el vm-limit.c and 137 other files
......@@ -2814,6 +2819,8 @@ Ronan Waide: changed smtpmail.el
Ross Patterson: wrote org-protocol.el
Roy Liu: changed ns-win.el
Rui-Tao Dong: changed nnweb.el
Rune Kleveland: changed xfns.c
......@@ -2990,7 +2997,7 @@ and co-wrote font-lock.el
and changed vc.el subr.el lisp.h keyboard.c simple.el files.el pcvs.el
keymap.c xdisp.c Makefile.in vc-hooks.el alloc.c newcomment.el
tex-mode.el bytecomp.el compile.el buffer.c info.el fill.el fileio.c
window.c and 909 other files
window.c and 910 other files
Stefan Reichör: changed gnus-agent.el
......@@ -3349,6 +3356,8 @@ and changed TUTORIAL.de Makefile.in calc.texi chinese.el czech.el emacs.1
supercite.el .cvsignore advice.el calc-forms.el calc-sel.el calendar.el
china-util.el cl-macs.el cl.texi and 51 other files
Werner Meisner: changed lwlib-Xm.c
Wes Hardaker: changed gnus-score.el gnus-art.el gnus-sum.el gnus-win.el
Will Glozer: changed macterm.c
......
......@@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
.PHONY: $(ALL)
VERSION = 23.2.92
VERSION = 23.2.93
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
......
2011-01-31 Deniz Dogan <deniz.a.m.dogan@gmail.com>
* net/rcirc.el: Clean log filenames (Bug#7933).
(rcirc-log-write): Use convert-standard-filename.
(rcirc-log-filename-function): Documentation updates.
2011-01-31 Alan Mackenzie <acm@muc.de>
* progmodes/cc-cmds.el (c-forward-over-illiterals): Continue
parsing if we encounter a naked # (Bug#7595).
(c-beginning-of-statement): Avoid loop in locating the beginning
of a macro.
2011-01-31 Chong Yidong <cyd@stupidchicken.com>
* files.el (copy-directory): Fix arguments to recursive call.
2011-01-29 Chong Yidong <cyd@stupidchicken.com>
* files.el (copy-directory): If destination is an existing
......
2011-01-31 Antoine Levitt <antoine.levitt@gmail.com> (tiny change)
* erc-track.el (track): Don't reset erc-modified-channels-object
each time erc-track-mode is activated.
2010-10-23 Julien Danjou <julien@danjou.info>
* erc-backend.el (erc-server-JOIN): Set the correct target list on join.
......
......@@ -649,7 +649,6 @@ module, otherwise the keybindings will not do anything useful."
(add-hook 'erc-send-completed-hook 'erc-user-is-active)
(add-hook 'erc-server-001-functions 'erc-user-is-active))
(erc-track-add-to-mode-line erc-track-position-in-mode-line)
(setq erc-modified-channels-object (erc-modified-channels-object nil))
(erc-update-mode-line)
(if (featurep 'xemacs)
(defadvice switch-to-buffer (after erc-update (&rest args) activate)
......
......@@ -4767,26 +4767,24 @@ this happens by default."
(file-name-nondirectory
(directory-file-name directory))
newname))
(if (and (file-exists-p newname)
(not (file-directory-p newname)))
(error "Cannot overwrite non-directory %s with a directory"
newname))
(and (file-exists-p newname)
(not (file-directory-p newname))
(error "Cannot overwrite non-directory %s with a directory"
newname))
(make-directory newname t))
;; Copy recursively.
(mapc
(lambda (file)
(let ((target (expand-file-name
(file-name-nondirectory file) newname))
(attrs (file-attributes file)))
(cond ((file-directory-p file)
(copy-directory file target keep-time parents))
((stringp (car attrs)) ; Symbolic link
(make-symbolic-link (car attrs) target t))
(t
(copy-file file target t keep-time)))))
;; We do not want to copy "." and "..".
(directory-files directory 'full directory-files-no-dot-files-regexp))
(dolist (file
;; We do not want to copy "." and "..".
(directory-files directory 'full
directory-files-no-dot-files-regexp))
(if (file-directory-p file)
(copy-directory file newname keep-time parents)
(let ((target (expand-file-name (file-name-nondirectory file) newname))
(attrs (file-attributes file)))
(if (stringp (car attrs)) ; Symbolic link
(make-symbolic-link (car attrs) target t)
(copy-file file target t keep-time)))))
;; Set directory attributes.
(set-file-modes newname (file-modes directory))
......
......@@ -2961,7 +2961,7 @@ Obsoletes `c-forward-into-nomenclature'.
;;;***
;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
;;;;;; (19752 41642))
;;;;;; (19776 49463))
;;; Generated autoloads from progmodes/cc-engine.el
 
(autoload 'c-guess-basic-syntax "cc-engine" "\
......@@ -3493,7 +3493,7 @@ Returns non-nil if any false statements are found.
;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer
;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive
;;;;;; checkdoc-interactive checkdoc checkdoc-list-of-strings-p)
;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (19752 41642))
;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (19770 11773))
;;; Generated autoloads from emacs-lisp/checkdoc.el
(put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp)
(put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp)
......@@ -3905,7 +3905,7 @@ is run).
;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command
;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
;;;;;; (19752 41642))
;;;;;; (19776 18606))
;;; Generated autoloads from comint.el
 
(defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
......@@ -4039,8 +4039,8 @@ on third call it again advances points to the next difference and so on.
;;;;;; compilation-shell-minor-mode compilation-mode compilation-start
;;;;;; compile compilation-disable-input compile-command compilation-search-path
;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook
;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19752
;;;;;; 41642))
;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (19770
;;;;;; 11773))
;;; Generated autoloads from progmodes/compile.el
 
(defvar compilation-mode-hook nil "\
......@@ -6060,7 +6060,7 @@ Optional arguments are passed to `dig-invoke'.
;;;### (autoloads (dired-mode dired-auto-revert-buffer dired-noselect
;;;;;; dired-other-frame dired-other-window dired dired-trivial-filenames
;;;;;; dired-listing-switches) "dired" "dired.el" (19752 41900))
;;;;;; dired-listing-switches) "dired" "dired.el" (19772 35352))
;;; Generated autoloads from dired.el
 
(defvar dired-listing-switches (purecopy "-al") "\
......@@ -6518,7 +6518,7 @@ Play sounds in message buffers.
;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap
;;;;;; define-globalized-minor-mode define-minor-mode) "easy-mmode"
;;;;;; "emacs-lisp/easy-mmode.el" (19752 41642))
;;;;;; "emacs-lisp/easy-mmode.el" (19767 41074))
;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
(defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
......@@ -6532,8 +6532,9 @@ Optional INIT-VALUE is the initial value of the mode's variable.
Optional LIGHTER is displayed in the modeline when the mode is on.
Optional KEYMAP is the default keymap bound to the mode keymap.
If non-nil, it should be a variable name (whose value is a keymap),
a keymap, or a list of arguments for `easy-mmode-define-keymap'.
If KEYMAP is a keymap or list, this also defines the variable MODE-map.
or an expression that returns either a keymap or a list of
arguments for `easy-mmode-define-keymap'. If KEYMAP is not a symbol,
this also defines the variable MODE-map.
 
BODY contains code to execute each time the mode is enabled or disabled.
It is executed after toggling the mode, and before running MODE-hook.
......@@ -8732,7 +8733,7 @@ This will add a speedbar major display mode.
;;;***
;;;### (autoloads (erc-track-minor-mode) "erc-track" "erc/erc-track.el"
;;;;;; (19752 41642))
;;;;;; (19783 2570))
;;; Generated autoloads from erc/erc-track.el
 
(defvar erc-track-minor-mode nil "\
......@@ -14160,7 +14161,7 @@ Example:
;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag
;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
;;;;;; image-dired-dired-with-window-configuration image-dired-dired-insert-marked-thumbs)
;;;;;; "image-dired" "image-dired.el" (19752 41642))
;;;;;; "image-dired" "image-dired.el" (19779 1536))
;;; Generated autoloads from image-dired.el
 
(autoload 'image-dired-dired-insert-marked-thumbs "image-dired" "\
......@@ -15409,7 +15410,7 @@ by `jka-compr-installed'.
 
;;;***
;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19752 41642))
;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19770 11773))
;;; Generated autoloads from progmodes/js.el
 
(autoload 'js-mode "js" "\
......@@ -17643,7 +17644,7 @@ Multiplication puzzle with GNU Emacs.
 
;;;***
;;;### (autoloads (msb-mode) "msb" "msb.el" (19752 41642))
;;;### (autoloads (msb-mode) "msb" "msb.el" (19777 41324))
;;; Generated autoloads from msb.el
 
(defvar msb-mode nil "\
......@@ -21925,7 +21926,7 @@ them into characters should be done separately.
;;;;;; quail-defrule quail-install-decode-map quail-install-map
;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout
;;;;;; quail-define-package quail-use-package quail-title) "quail"
;;;;;; "international/quail.el" (19752 41642))
;;;;;; "international/quail.el" (19778 61528))
;;; Generated autoloads from international/quail.el
 
(autoload 'quail-title "quail" "\
......@@ -22229,7 +22230,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
;;;***
;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
;;;;;; "net/rcirc.el" (19752 41642))
;;;;;; "net/rcirc.el" (19783 16707))
;;; Generated autoloads from net/rcirc.el
 
(autoload 'rcirc "rcirc" "\
......@@ -22277,7 +22278,7 @@ See \\[compile].
;;;***
;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
;;;;;; (19752 41642))
;;;;;; (19771 17123))
;;; Generated autoloads from emacs-lisp/re-builder.el
 
(defalias 'regexp-builder 're-builder)
......@@ -22863,8 +22864,8 @@ variable.
;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers
;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
;;;;;; rmail-dont-reply-to-names rmail-user-mail-address-regexp
;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19752
;;;;;; 41899))
;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19761
;;;;;; 5822))
;;; Generated autoloads from mail/rmail.el
 
(autoload 'rmail-movemail-variant-p "rmail" "\
......@@ -23316,7 +23317,7 @@ for modes derived from Text mode, like Mail mode.
;;;***
;;;### (autoloads (ruby-mode) "ruby-mode" "progmodes/ruby-mode.el"
;;;;;; (19752 41642))
;;;;;; (19771 32139))
;;; Generated autoloads from progmodes/ruby-mode.el
 
(autoload 'ruby-mode "ruby-mode" "\
......@@ -24349,7 +24350,7 @@ If BINARY is non-nil, return a string in binary form.
;;;***
;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el"
;;;;;; (19752 41642))
;;;;;; (19780 34298))
;;; Generated autoloads from emacs-lisp/shadow.el
 
(autoload 'list-load-path-shadows "shadow" "\
......@@ -32013,8 +32014,8 @@ Zone out, completely.
;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el"
;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el"
;;;;;; "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el"
;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19761
;;;;;; 5801 21534))
;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19783
;;;;;; 30333 273722))
 
;;;***
......@@ -1520,8 +1520,11 @@ return the filename, or nil if no logging is desired for this
session.
If the returned filename is absolute (`file-name-absolute-p'
returns true), then it is used as-is, otherwise the resulting
file is put into `rcirc-log-directory'."
returns t), then it is used as-is, otherwise the resulting file
is put into `rcirc-log-directory'.
The filename is then cleaned using `convert-standard-filename' to
guarantee valid filenames for the current OS."
:group 'rcirc
:type 'function)
......@@ -1546,7 +1549,9 @@ file is put into `rcirc-log-directory'."
Log data is written to `rcirc-log-directory', except for
log-files with absolute names (see `rcirc-log-filename-function')."
(dolist (cell rcirc-log-alist)
(let ((filename (expand-file-name (car cell) rcirc-log-directory))
(let ((filename (convert-standard-filename
(expand-file-name (car cell)
rcirc-log-directory)))
(coding-system-for-write 'utf-8))
(make-directory (file-name-directory filename) t)
(with-temp-buffer
......
......@@ -2458,13 +2458,15 @@ function does not require the declaration to contain a brace block."
(goto-char last)
(throw 'done '(nil . nil)))
;; Stop if we encounter a preprocessor line.
((and (not macro-end)
;; Stop if we encounter a preprocessor line. Continue if we
;; hit a naked #
((and c-opt-cpp-prefix
(not macro-end)
(eq (char-after) ?#)
(= (point) (c-point 'boi)))
(goto-char last)
;(throw 'done (cons (eq (point) here) 'macro-boundary))) ; Changed 2003/3/26
(throw 'done '(t . macro-boundary)))
(if (= (point) here) ; Not a macro, therefore naked #.
(forward-char)
(throw 'done '(t . macro-boundary))))
;; Stop after a ';', '}', or "};"
((looking-at ";\\|};?")
......@@ -2578,14 +2580,21 @@ be more \"DWIM:ey\"."
(c-backward-syntactic-ws))
(or (bobp) (c-after-statement-terminator-p)))))))
;; Are we about to move backwards into or out of a
;; preprocessor command? If so, locate it's beginning.
;; preprocessor command? If so, locate its beginning.
(when (eq (cdr res) 'macro-boundary)
(save-excursion
(beginning-of-line)
(setq macro-fence
(and (not (bobp))
(progn (c-skip-ws-backward) (c-beginning-of-macro))
(point)))))
(setq macro-fence
(save-excursion
(if macro-fence
(progn
(end-of-line)
(and (not (eobp))
(progn (c-skip-ws-forward)
(c-beginning-of-macro))
(progn (c-end-of-macro)
(point))))
(and (not (eobp))
(c-beginning-of-macro)
(progn (c-end-of-macro) (point)))))))
;; Are we about to move backwards into a literal?
(when (memq (cdr res) '(macro-boundary literal))
(setq range (c-ascertain-preceding-literal)))
......
......@@ -32,7 +32,7 @@
(defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\
Short copyright string for this version of Emacs.")
(defconst emacs-version "23.2.92" "\
(defconst emacs-version "23.2.93" "\
Version numbers of this version of Emacs.")
(defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment