Commit bcb20052 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge trunk

parents 771533aa 99833607
......@@ -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.1.95 of GNU Emacs, the extensible,
This directory tree holds version 23.1.96 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.62 for emacs 23.1.95.
# Generated by GNU Autoconf 2.62 for emacs 23.1.96.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
......@@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='emacs'
PACKAGE_TARNAME='emacs'
PACKAGE_VERSION='23.1.95'
PACKAGE_STRING='emacs 23.1.95'
PACKAGE_VERSION='23.1.96'
PACKAGE_STRING='emacs 23.1.96'
PACKAGE_BUGREPORT=''
ac_unique_file="src/lisp.h"
......@@ -1371,7 +1371,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.1.95 to adapt to many kinds of systems.
\`configure' configures emacs 23.1.96 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1445,7 +1445,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of emacs 23.1.95:";;
short | recursive ) echo "Configuration of emacs 23.1.96:";;
esac
cat <<\_ACEOF
......@@ -1588,7 +1588,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
emacs configure 23.1.95
emacs configure 23.1.96
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1602,7 +1602,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.1.95, which was
It was created by emacs $as_me 23.1.96, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
......@@ -26259,7 +26259,7 @@ exec 6>&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.1.95, which was
This file was extended by emacs $as_me 23.1.96, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -26312,7 +26312,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
emacs config.status 23.1.95
emacs config.status 23.1.96
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
......@@ -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.1.95)
AC_INIT(emacs, 23.1.96)
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.1.95
@set EMACSVER 23.1.96
@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.1.95
@center Emacs Version 23.1.96
@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.1.95
@set EMACSVER 23.1.96
@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.1.95
@set EMACSVER 23.1.96
@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.1.95
@set EMACSVER 23.1.96
@set DATE July 2009
@dircategory Emacs
......
.\" See section COPYING for copyright and redistribution information.
.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.95"
.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.96"
.
.
.SH NAME
......
2010-04-18 Chong Yidong <cyd@stupidchicken.com>
* ede.texi (EDE Mode): Refer to init file rather than `.emacs'. Note
that Development menu is always available.
(Creating a project): Fix terminology.
(Add/Remove files): Fix typo.
2010-04-17 Teodor Zlatanov <tzz@lifelogs.com>
* gnus.texi (Gnus Versions, Oort Gnus): Mention the Git repo instead of
......
......@@ -129,27 +129,26 @@ information.
@node EDE Mode, Creating a project, EDE Project Concepts, top
@chapter @ede{} Mode
@ede{} is implemented as a minor-mode, which augments other modes such
@ede{} is implemented as a minor mode, which augments other modes such
as C mode, and Texinfo mode. You can enable @ede{} for all buffers by
running the command @code{global-ede-mode}, or by putting this in your
@file{~/.emacs} file:
init file:
@example
(global-ede-mode t)
@end example
When @ede{} is active for a given buffer, the menu item
``Development'' appears. This menu provides several menu items for
high-level @ede{} commands. These menu items, and their corresponding
keybindings, are independent of the type of project you are actually
working on.
Activating @ede{} adds a menu named @samp{Development} to the menu
bar. This menu provides several menu items for high-level @ede{}
commands. These menu items, and their corresponding keybindings, are
independent of the type of project you are actually working on.
@node Creating a project, Modifying your project, EDE Mode, top
@chapter Creating a project
To create a new project, first visit a file that you want to include
in that project. If you have a hierarchy of directories, choose a
file in the topmost directory first. From this buffer, type @kbd{M-x
in that project. If you have a hierarchy of directories, first visit
a file in the topmost directory. From this buffer, type @kbd{M-x
ede-new}, or click on the @samp{Create Project} item in the
@samp{Development} menu.
......@@ -220,8 +219,8 @@ detailed information about exactly what these features do.
@node Add/Remove target, Add/Remove files, Modifying your project, Modifying your project
@section Add/Remove target
To create a new target, type @kbd{C-c . t} (@code{M-x ede-new-target})
or use the @samp{Add Target} menu item in the @samp{Project Options}
To create a new target, type @kbd{C-c . t} (@code{ede-new-target}) or
use the @samp{Add Target} menu item in the @samp{Project Options}
submenu. This prompts for a target name, and adds the current buffer
to that target.
......@@ -237,7 +236,7 @@ Options} submenu.
@section Add/Remove files
To add the current file to an existing target, type @kbd{C-c . a}
(@code{ede-add-file}), or or use the @samp{Add File} menu item in the
(@code{ede-add-file}), or use the @samp{Add File} menu item in the
@samp{Target Options} submenu.
You can add a file to more than one target; this is OK.
......
......@@ -5,7 +5,7 @@
@c %**end of header
@c This is used in many places
@set VER 23.1.95
@set VER 23.1.96
@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
@c Feel free to install changes without prior permission (but I'd
......
......@@ -435,8 +435,8 @@ Chong Yidong: wrote redisplay-testsuite.el
and co-wrote longlines.el
and changed xdisp.c simple.el files.el display.texi frames.texi
files.texi emacs.texi keyboard.c cus-edit.el faces.el xterm.c
Makefile.in xfaces.c font.c startup.el xfns.c misc.texi image.c
compile.el custom.texi text.texi and 633 other files
Makefile.in xfaces.c font.c misc.texi startup.el xfns.c image.c
compile.el custom.texi text.texi and 635 other files
Chris Chase: co-wrote idlw-shell.el idlwave.el
......@@ -1002,7 +1002,7 @@ Flemming Hoejstrup Hansen: changed forms.el
Florian Weimer: changed message.el gnus.el coding.c gnus-sum.el gnus.texi
mm-decode.el mm-util.el
Francesc Rocher: changed startup.el MORE.STUFF cus-start.el gnus.el
Francesc Rocher: changed MORE.STUFF startup.el cus-start.el gnus.el
gnus.png gnus.svg macterm.c splash.png splash.svg splash8.xpm w32term.c
xdisp.c xterm.c
......@@ -1131,9 +1131,9 @@ Giuseppe Scrivano: changed buffer.c configure.in sysdep.c xsmfns.c
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
cal-islam.el bytecomp.el calendar.texi cal-bahai.el files.el appt.el
cal-china.el emacs.texi rmailsum.el simple.el startup.el
and 975 other files
cal-islam.el bytecomp.el calendar.texi cal-bahai.el emacs.texi files.el
appt.el cal-china.el rmailsum.el simple.el startup.el
and 976 other files
Glynn Clements: wrote gamegrid.el snake.el tetris.el
......@@ -1346,7 +1346,7 @@ Jan Djärv: wrote dnd.el font-setting.el x-dnd.el
and changed gtkutil.c xterm.c xfns.c configure.in xterm.h xmenu.c
x-win.el Makefile.in gtkutil.h keyboard.c frame.c frames.texi config.in
emacs.c xselect.c xresources.texi startup.el alloc.c cus-start.el
xlwmenu.c process.c and 203 other files
xlwmenu.c frame.h and 203 other files
Jan Moringen: co-wrote cpp.el
......@@ -1635,7 +1635,7 @@ and changed files.el perl-mode.el
Juanma Barranquero: changed makefile.w32-in subr.el files.el faces.el
bs.el help-fns.el w32fns.c org.el server.el simple.el emacsclient.c
desktop.el buffer.c mule-cmds.el ido.el window.c xdisp.c allout.el
keyboard.c replace.el eval.c and 930 other files
keyboard.c replace.el eval.c and 932 other files
Juergen Hoetzel: changed url-handlers.el
......@@ -1657,7 +1657,7 @@ Juri Linkov: wrote files-x.el misearch.el
and changed info.el isearch.el simple.el replace.el dired-aux.el
startup.el grep.el compile.el dired.el files.el faces.el display.texi
menu-bar.el descr-text.el cus-edit.el bindings.el man.el image-mode.el
ispell.el text.texi dired-x.el and 280 other files
ispell.el text.texi dired-x.el and 281 other files
Justin Bogner: changed fortune.el
......@@ -1969,7 +1969,7 @@ Maciek Pasternacki: changed nnrss.el
Magnus Henoch: changed url-http.el ispell.el url.el dbusbind.c dns.el
url-gw.el url-parse.el url-proxy.el autoinsert.el cl.texi configure.in
cyrillic.el dbus.el gnus.texi hashcash.el log-edit.el message.el
org-latex.el org-table.el process.c rcirc.el and 7 other files
org-latex.el org-table.el process.c rcirc.el and 8 other files
Malcolm Purvis: changed spam-stat.el
......@@ -2432,7 +2432,7 @@ Oscar Figueiredo: wrote eudc-bob.el eudc-export.el eudc-hotlist.el
eudc-vars.el eudc.el eudcb-bbdb.el eudcb-ldap.el eudcb-ph.el ldap.el
and changed ph.el
Óscar Fuentes: changed emacsclient.c ido.el vc-bzr.el
Óscar Fuentes: changed ido.el emacsclient.c vc-bzr.el
P. E. Jareth Hein: changed gnus-util.el
......@@ -3080,7 +3080,7 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el imap-hash.el
and changed spam.el gnus.el gnus-sum.el gnus.texi nnimap.el netrc.el
spam-stat.el gnus-start.el gnus-util.el nnmail.el encrypt.el message.el
gnus-encrypt.el mail-source.el assistant.el auth.texi imap.el
nnbabyl.el nnfolder.el nnmbox.el nnmh.el and 48 other files
nnbabyl.el nnfolder.el nnmbox.el nnmh.el and 51 other files
Terje Rosten: changed xfns.c version.el xterm.c xterm.h
......
......@@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
.PHONY: $(ALL)
VERSION = 23.1.95
VERSION = 23.1.96
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
......
......@@ -4,6 +4,25 @@
(tamil-composable-pattern, malayalam-composable-pattern): Add
two-part vowels to "v" (vowel sign).
2010-04-20 Chong Yidong <cyd@stupidchicken.com>
* files.el (copy-directory): Handle symlinks (Bug#5982).
* progmodes/compile.el (compilation-next-error-function): Revert
2009-10-12 change (Bug#5983).
2010-04-20 Dan Nicolaescu <dann@ics.uci.edu>
* vc-hg.el (vc-hg-state): Use HGRCPATH, not HGRC.
(vc-hg-working-revision): Likewise. Use hg parents, not hg parent
(Bug#5846).
2010-04-20 Glenn Morris <rgm@gnu.org>
* emacs-lisp/lisp.el (lisp-completion-at-point): Give it a doc string.
* minibuffer.el (completion-at-point): Doc fix.
2010-04-18 Chong Yidong <cyd@stupidchicken.com>
* cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Don't
......@@ -108,7 +127,7 @@
2010-03-29 Stefan Monnier <monnier@iro.umontreal.ca>
Make tmm-menubar work for the Buffers menu again.
Make tmm-menubar work for the Buffers menu again (bug#5726).
* tmm.el (tmm-prompt): Also handle keymap entries in the form of
vectors rather than cons cells, as used in menu-bar-update-buffers.
......
......@@ -627,9 +627,10 @@ considered."
(let ((completion-annotate-function (plist-get plist :annotate-function)))
(completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)
(plist-get plist :predicate)))))
(defun lisp-completion-at-point (&optional predicate)
"Function used for `completion-at-point-functions' in `emacs-lisp-mode'."
;; FIXME: the `end' could be after point?
(let* ((end (point))
(beg (with-syntax-table emacs-lisp-mode-syntax-table
......
......@@ -4735,10 +4735,14 @@ this happens by default."
(mapc
(lambda (file)
(let ((target (expand-file-name
(file-name-nondirectory file) newname)))
(if (file-directory-p file)
(copy-directory file target keep-time parents)
(copy-file file target t keep-time))))
(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))
......
This diff is collapsed.
......@@ -381,18 +381,32 @@ the second failed attempt to complete."
(defconst completion-styles-alist
'((emacs21
completion-emacs21-try-completion completion-emacs21-all-completions
"Simple prefix-based completion.")
"Simple prefix-based completion.
I.e. when completing \"foo_bar\" (where _ is the position of point),
it will consider all completions candidates matching the glob
pattern \"foobar*\".")
(emacs22
completion-emacs22-try-completion completion-emacs22-all-completions
"Prefix completion that only operates on the text before point.")
"Prefix completion that only operates on the text before point.
I.e. when completing \"foo_bar\" (where _ is the position of point),
it will consider all completions candidates matching the glob
pattern \"foo*\" and will add back \"bar\" to the end of it.")
(basic
completion-basic-try-completion completion-basic-all-completions
"Completion of the prefix before point and the suffix after point.")
"Completion of the prefix before point and the suffix after point.
I.e. when completing \"foo_bar\" (where _ is the position of point),
it will consider all completions candidates matching the glob
pattern \"foo*bar*\".")
(partial-completion
completion-pcm-try-completion completion-pcm-all-completions
"Completion of multiple words, each one taken as a prefix.
E.g. M-x l-c-h can complete to list-command-history
and C-x C-f /u/m/s to /usr/monnier/src.")
I.e. when completing \"l-co_h\" (where _ is the position of point),
it will consider all completions candidates matching the glob
pattern \"l*-co*h*\".
Furthermore, for completions that are done step by step in subfields,
the method is applied to all the preceding fields that do not yet match.
E.g. C-x C-f /u/mo/s TAB could complete to /usr/monnier/src.
Additionally the user can use the char \"*\" as a glob pattern.")
(initials
completion-initials-try-completion completion-initials-all-completions
"Completion of acronyms and initialisms.
......@@ -407,7 +421,19 @@ ALL-COMPLETIONS is the function that lists the completions (it should
follow the calling convention of `completion-all-completions'),
and DOC describes the way this style of completion works.")
(defcustom completion-styles '(basic partial-completion emacs22)
(defcustom completion-styles
;; First, use `basic' because prefix completion has been the standard
;; for "ever" and works well in most cases, so using it first
;; ensures that we obey previous behavior in most cases.
'(basic
;; Then use `partial-completion' because it has proven to
;; be a very convenient extension.
partial-completion
;; Finally use `emacs22' so as to maintain (in many/most cases)
;; the previous behavior that when completing "foobar" with point
;; between "foo" and "bar" the completion try to complete "foo"
;; and simply add "bar" to the end of the result.
emacs22)
"List of completion styles to use.
The available styles are listed in `completion-styles-alist'."
:type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x)))
......@@ -1137,7 +1163,9 @@ Currently supported properties are:
`:annotation-function' the value to use for `completion-annotate-function'.")
(defun completion-at-point ()
"Complete the thing at point according to local mode."
"Complete the thing at point according to local mode.
This runs the hook `completion-at-point-functions' until a member returns
non-nil."
(interactive)
(let ((res (run-hook-with-args-until-success
'completion-at-point-functions)))
......
......@@ -1950,13 +1950,16 @@ This is the value of `next-error-function' in Compilation buffers."
;; (`omake -P' polls filesystem for changes and recompiles when needed
;; in the same process and buffer).
;; So, recalculate all markers for that file.
(unless (and (nth 3 loc) (marker-buffer (nth 3 loc)) (nthcdr 4 loc)
;; There may be no timestamp info if the loc is a `fake-loc',
;; but we just checked that the file has been visited before!
(equal (nth 4 loc)
(setq timestamp
(with-current-buffer (marker-buffer (nth 3 loc))
(visited-file-modtime)))))
(unless (and (nth 3 loc) (marker-buffer (nth 3 loc))
;; There may be no timestamp info if the loc is a `fake-loc'.
;; So we skip the time-check here, although we should maybe
;; change `compilation-fake-loc' to add timestamp info.
(or (null (nth 4 loc))
(equal (nth 4 loc)
(setq timestamp
(with-current-buffer
(marker-buffer (nth 3 loc))
(visited-file-modtime))))))
(with-current-buffer (compilation-find-file marker (caar (nth 2 loc))
(cadr (car (nth 2 loc))))
(save-restriction
......
......@@ -168,12 +168,13 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
(condition-case nil
;; Ignore all errors.
(let ((process-environment
;; Avoid localization of messages so we can parse the output.
(append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") process-environment)))
(process-file
"hg" nil t nil
"status" "-A" (file-relative-name file)))
;; Avoid localization of messages so we
;; can parse the output.
(append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
process-environment)))
(process-file
"hg" nil t nil
"status" "-A" (file-relative-name file)))
;; Some problem happened. E.g. We can't find an `hg'
;; executable.
(error nil)))))))
......@@ -197,7 +198,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
((status nil)
(default-directory (file-name-directory file))
;; Avoid localization of messages so we can parse the output.
(avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=")
(avoid-local-env (append (list "TERM=dumb" "LANGUAGE=C" "HGRCPATH=")
process-environment))
(out
(with-output-to-string
......@@ -209,7 +210,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
;; Ignore all errors.
(process-file
"hg" nil t nil
"parent" "--template" "{rev}" (file-relative-name file)))
"parents" "--template" "{rev}" (file-relative-name file)))
;; Some problem happened. E.g. We can't find an `hg'
;; executable.
(error nil)))))))
......
......@@ -32,7 +32,7 @@
(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
Short copyright string for this version of Emacs.")
(defconst emacs-version "23.1.95" "\
(defconst emacs-version "23.1.96" "\
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))) "\
......
......@@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
<key>CFBundleExecutable</key>
<string>Emacs</string>
<key>CFBundleGetInfoString</key>
<string>Emacs 23.1.95 Copyright (C) 2010 Free Software Foundation, Inc.</string>
<string>Emacs 23.1.96 Copyright (C) 2010 Free Software Foundation, Inc.</string>
<key>CFBundleIconFile</key>
<string>Emacs.icns</string>
<key>CFBundleIdentifier</key>
......@@ -566,7 +566,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
<string>APPL</string>
<!-- This should be the emacs version number. -->
<key>CFBundleShortVersionString</key>
<string>23.1.95</string>
<string>23.1.96</string>
<key>CFBundleSignature</key>
<string>EMAx</string>
<!-- This SHOULD be a build number. -->
......
/* Localized versions of Info.plist keys */
CFBundleName = "Emacs";
CFBundleShortVersionString = "Version 23.1.95";
CFBundleGetInfoString = "Emacs version 23.1.95, NS Windowing";
CFBundleShortVersionString = "Version 23.1.96";
CFBundleGetInfoString = "Emacs version 23.1.96, NS Windowing";
NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
[Desktop Entry]
Encoding=UTF-8
Type=Application
Version=23.1.95
Version=23.1.96
Categories=GNUstep
Name=Emacs
Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
......
......@@ -2,7 +2,7 @@
ApplicationDescription = "GNU Emacs for GNUstep / OS X";
ApplicationIcon = emacs.tiff;
ApplicationName = Emacs;
ApplicationRelease = "23.1.95";
ApplicationRelease = "23.1.96";
Authors = (
"Adrian Robert (GNUstep)",
"Christophe de Dinechin (MacOS X)",
......@@ -13,7 +13,7 @@
);
Copyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
FullVersionID = "Emacs 23.1.95, NS Windowing";
FullVersionID = "Emacs 23.1.96, NS Windowing";
NSExecutable = Emacs;
NSIcon = emacs.tiff;
NSPrincipalClass = NSApplication;
......
......@@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,1,95,0
PRODUCTVERSION 23,1,95,0
FILEVERSION 23,1,96,0
PRODUCTVERSION 23,1,96,0
FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG
FILEFLAGS 0x1L
......@@ -25,12 +25,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
VALUE "FileVersion", "23, 1, 95, 0\0"
VALUE "FileVersion", "23, 1, 96, 0\0"
VALUE "InternalName", "Emacs\0"
VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs\0"
VALUE "ProductVersion", "23, 1, 95, 0\0"
VALUE "ProductVersion", "23, 1, 96, 0\0"
VALUE "OLESelfRegister", "\0"
END
END
......
......@@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,1,95,0
PRODUCTVERSION 23,1,95,0
FILEVERSION 23,1,96,0
PRODUCTVERSION 23,1,96,0
FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG
FILEFLAGS 0x1L
......@@ -23,12 +23,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
VALUE "FileVersion", "23, 1, 95, 0\0"
VALUE "FileVersion", "23, 1, 96, 0\0"
VALUE "InternalName", "EmacsClient\0"
VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
VALUE "OriginalFilename", "emacsclientw.exe"
VALUE "ProductName", "EmacsClient\0"
VALUE "ProductVersion", "23, 1, 95, 0\0"
VALUE "ProductVersion", "23, 1, 96, 0\0"
VALUE "OLESelfRegister", "\0"
END