Permalink
Browse files

Merge branch 'emacs23'

Conflicts:
	etc/NEWS.1-17
	etc/NEWS.18
	etc/NEWS.19
	etc/NEWS.20
	etc/NEWS.21
	etc/NEWS.22
	lisp/progmodes/prolog.el
	nextstep/Cocoa/Emacs.base/Contents/Info.plist
	nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
	src/nsfns.m
  • Loading branch information...
2 parents 37c7fde + 6b51c66 commit 25bd090c832420e157437c44bbb78671183c1a3a @davidswelt committed May 30, 2012
Showing 2,013 changed files with 3,335 additions and 2,939 deletions.
View
@@ -1,3 +1,15 @@
+2012-01-19 Chong Yidong <cyd@gnu.org>
+
+ * Version 23.4 released.
+
+2012-01-15 Chong Yidong <cyd@gnu.org>
+
+ * make-dist: Distribute the etc/grammars subdirectory.
+
+2012-01-12 Glenn Morris <rgm@gnu.org>
+
+ * configure.in: Add i386 to cpp_undefs (Bug#8497).
+
2011-03-13 Glenn Morris <rgm@gnu.org>
* configure.in (FREETYPE_LIBS): Actually set it to something.
@@ -7947,7 +7959,7 @@
;; End:
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
- 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
View
@@ -1,6 +1,6 @@
GNU Emacs Installation Guide
Copyright (C) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
See the end of the file for license conditions.
View
@@ -1,4 +1,4 @@
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
See the end of the file for license conditions.
View
@@ -3,7 +3,7 @@
# DIST: that first.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
View
4 README
@@ -1,9 +1,9 @@
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
- 2010, 2011 Free Software Foundation, Inc.
+ 2010, 2011, 2012 Free Software Foundation, Inc.
See the end of the file for license conditions.
-This directory tree holds version 23.3.50 of GNU Emacs, the extensible,
+This directory tree holds version 23.4 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
View
@@ -1,3 +1,13 @@
+2012-02-06 Christoph Scholtes <cschol2112@googlemail.com>
+
+ * nt/README.W32: Backported fixed url for image libraries from
+ trunk. Removed explicit reference to version of libXpm included in
+ binary distributions for maintenance purposes.
+
+2012-01-19 Chong Yidong <cyd@gnu.org>
+
+ * Version 23.4 released.
+
2011-03-07 Chong Yidong <cyd@stupidchicken.com>
* Version 23.3 released.
@@ -877,7 +887,7 @@
;; End:
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
- 2010, 2011 Free Software Foundation, Inc.
+ 2010, 2011, 2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
View
@@ -1,5 +1,5 @@
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
- 2010, 2011 Free Software Foundation, Inc.
+ 2010, 2011, 2012 Free Software Foundation, Inc.
See the end of the file for license conditions.
View
@@ -1,7 +1,7 @@
;;; admin.el --- utilities for Emacs administration
;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-;; 2010, 2011 Free Software Foundation, Inc.
+;; 2010, 2011, 2012 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
View
@@ -1,5 +1,5 @@
/* Allocate X colors. Used for testing with dense colormaps.
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
This file is part of GNU Emacs.
View
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# Build Emacs in several different configurations.
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@@ -1,4 +1,4 @@
-Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
Copyright (C) 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H13PRO009
View
@@ -1,6 +1,6 @@
;;; cus-test.el --- tests for custom types and load problems
-;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
;; Free Software Foundation, Inc.
;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
View
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
View
@@ -1,7 +1,7 @@
#! /bin/bash
## Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-## 2010, 2011 Free Software Foundation, Inc.
+## 2010, 2011, 2012 Free Software Foundation, Inc.
## Author: Francesco Potorti` <pot@gnu.org>
View
@@ -2,7 +2,7 @@
# Build Emacs with various options for profiling, debugging,
# with and without warnings enabled etc.
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
View
@@ -1,4 +1,4 @@
-Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
See the end of the file for license conditions.
View
@@ -1,4 +1,4 @@
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
See the end of the file for license conditions.
View
@@ -1,6 +1,6 @@
Some lisp/emacs-lisp/ Features and Where They Are Documented
-Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
See the end of the file for license conditions.
View
@@ -1,6 +1,6 @@
-*- coding: utf-8; mode: text; -*-
-Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
See the end of the file for license conditions.
From README.multi-tty in the multi-tty branch.
View
@@ -1,6 +1,6 @@
-*-mode: text; coding: latin-1;-*-
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
See the end of the file for license conditions.
@@ -1,4 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
See the end of the file for license conditions.
@@ -1,4 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
See the end of the file for license conditions.
View
@@ -1,4 +1,4 @@
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
Free Software Foundation, Inc.
See the end of the file for license conditions.
@@ -114,13 +114,11 @@ See the end of the file for license conditions.
Emacs has built in support for XBM and PPM/PGM/PBM images, and the
libXpm library is bundled, providing XPM support (required for color
toolbar icons and splash screen). Source for libXpm should be available
- on the same place as you got this binary distribution from. The version
- of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's
- libXpm library from X11R7.3.
+ on the same place as you got this binary distribution from.
Emacs can also support some other image formats with appropriate
libraries. These libraries are all available as part of GTK
- download for Windows (http://www.gtk.org/download-windows.html), or
+ download for Windows (http://www.gtk.org/download/win32.php), or
from the GnuWin32 project. Emacs will find them if the directory
they are installed in is on the PATH.
View
@@ -1,6 +1,6 @@
@echo off
-rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
rem Free Software Foundation, Inc.
rem Cannot use brackets in andrewi's email below because
@@ -1,7 +1,7 @@
#!/bin/sh
### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
## Free Software Foundation, Inc.
## Author: Miles Bader <miles@gnu.org>
View
@@ -2,7 +2,7 @@
rem ----------------------------------------------------------------------
rem Configuration script for MSDOS
rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
-rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+rem 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
Oops, something went wrong.

0 comments on commit 25bd090

Please sign in to comment.