Mercurial > emacs

changeset 107009:3e16e7dbb4a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from trunk
author Jason Rumney <jasonr@gnu.org>
date Mon, 11 Jan 2010 22:34:47 +0800
parents 50223db834f2 (current diff) f039ef236594 (diff)
children 238592f6c24a
files
diffstat 14 files changed, 87 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/doc/emacs/ChangeLog	Sun Jan 10 22:34:14 2010 +0800
+++ b/doc/emacs/ChangeLog	Mon Jan 11 22:34:47 2010 +0800
@@ -1,3 +1,8 @@
+2010-01-11  Glenn Morris  <rgm@gnu.org>
+
+	* display.texi (Highlight Interactively): `t' does not mean highlight
+	all patterns.  (Bug#5335)
+
 2009-12-29  Chong Yidong  <cyd@stupidchicken.com>
 
 	* misc.texi (Shell): Document async-shell-command.
--- a/doc/emacs/display.texi	Sun Jan 10 22:34:14 2010 +0800
+++ b/doc/emacs/display.texi	Mon Jan 11 22:34:47 2010 +0800
@@ -1,6 +1,8 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+@c   Free Software Foundation, Inc.
+
 @c See file emacs.texi for copying conditions.
 @node Display, Search, Registers, Top
 @chapter Controlling the Display
@@ -775,15 +777,14 @@
 
 @vindex hi-lock-file-patterns-policy
 The variable @code{hi-lock-file-patterns-policy} controls whether Hi
-Lock mode should automatically extract and highlight patterns found in
-a file when it is visited.  Its value can be @code{nil} (never
-highlight), @code{t} (highlight the patterns), @code{ask} (query the
-user), or a function.  If it is a function,
-@code{hi-lock-find-patterns} calls it with the patterns as argument;
-if the function returns non-@code{nil}, the patterns are used.  The
-default is @code{nil}.  Note that patterns are always highlighted if
-you call @code{hi-lock-find-patterns} directly, regardless of the
-value of this variable.
+Lock mode should automatically extract and highlight patterns found in a
+file when it is visited.  Its value can be @code{nil} (never highlight),
+@code{ask} (query the user), or a function.  If it is a function,
+@code{hi-lock-find-patterns} calls it with the patterns as argument; if
+the function returns non-@code{nil}, the patterns are used.  The default
+is @code{ask}.  Note that patterns are always highlighted if you call
+@code{hi-lock-find-patterns} directly, regardless of the value of this
+variable.
 
 @vindex hi-lock-exclude-modes
 Also, @code{hi-lock-find-patterns} does nothing if the current major
--- a/lib-src/ChangeLog	Sun Jan 10 22:34:14 2010 +0800
+++ b/lib-src/ChangeLog	Mon Jan 11 22:34:47 2010 +0800
@@ -1,3 +1,9 @@
+2010-01-11  Glenn Morris  <rgm@gnu.org>
+
+	* ebrowse.c (version):
+	* etags.c (print_version):
+	* rcs2log (Copyright): Set copyright year to 2010.
+
 2009-12-09  David Robinow  <drobinow@gmail.com>  (tiny change)
 
 	* makefile.w32-in: Use parenthesis for macros for nmake
--- a/lib-src/ebrowse.c	Sun Jan 10 22:34:14 2010 +0800
+++ b/lib-src/ebrowse.c	Mon Jan 11 22:34:47 2010 +0800
@@ -1,7 +1,7 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-              2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+              2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
               Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -3680,7 +3680,7 @@
 version ()
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2009 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
 
   printf ("ebrowse %s\n", VERSION);
   puts (emacs_copyright);
--- a/lib-src/etags.c	Sun Jan 10 22:34:14 2010 +0800
+++ b/lib-src/etags.c	Mon Jan 11 22:34:47 2010 +0800
@@ -29,7 +29,7 @@
 
 
 Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995, 1998, 1999,
-  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
   Free Software Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
@@ -898,7 +898,7 @@
 print_version ()
 {
   /* Makes it easier to update automatically. */
-  char emacs_copyright[] = "Copyright (C) 2009 Free Software Foundation, Inc.";
+  char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
 
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
   puts (emacs_copyright);
--- a/lib-src/rcs2log	Sun Jan 10 22:34:14 2010 +0800
+++ b/lib-src/rcs2log	Mon Jan 11 22:34:47 2010 +0800
@@ -3,7 +3,7 @@
 # RCS to ChangeLog generator
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-#               2004, 2005, 2006, 2007, 2008, 2009
+#               2004, 2005, 2006, 2007, 2008, 2009, 2010
 #               Free Software Foundation, Inc.
 
 # Author: Paul Eggert <eggert@twinsun.com>
@@ -22,7 +22,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-Copyright='Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2010 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
--- a/lisp/ChangeLog	Sun Jan 10 22:34:14 2010 +0800
+++ b/lisp/ChangeLog	Mon Jan 11 22:34:47 2010 +0800
@@ -1,3 +1,7 @@
+2010-01-11  Glenn Morris  <rgm@gnu.org>
+
+	* version.el (emacs-copyright): Set copyright year to 2010.
+
 2010-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* format.el (format-annotate-function): Only set
--- a/lisp/version.el	Sun Jan 10 22:34:14 2010 +0800
+++ b/lisp/version.el	Mon Jan 11 22:34:47 2010 +0800
@@ -1,7 +1,7 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -29,7 +29,7 @@
 
 ;;; Code:
 
-(defconst emacs-copyright "Copyright (C) 2009 Free Software Foundation, Inc." "\
+(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
 Short copyright string for this version of Emacs.")
 
 (defconst emacs-version "23.1.91" "\
--- a/nextstep/ChangeLog	Sun Jan 10 22:34:14 2010 +0800
+++ b/nextstep/ChangeLog	Mon Jan 11 22:34:47 2010 +0800
@@ -1,3 +1,10 @@
+2010-01-11  Glenn Morris  <rgm@gnu.org>
+
+	* Cocoa/Emacs.base/Contents/Info.plist:
+	* Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
+	* GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+	Set copyright year to 2010.
+
 2009-09-23  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
 	* README: Note GNUstep support is now Startup 0.23 or later.
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist	Sun Jan 10 22:34:14 2010 +0800
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist	Mon Jan 11 22:34:47 2010 +0800
@@ -553,7 +553,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Emacs</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Emacs 23.1.91 Copyright (C) 2009 Free Software Foundation, Inc.</string>
+	<string>Emacs 23.1.91 Copyright (C) 2010 Free Software Foundation, Inc.</string>
 	<key>CFBundleIconFile</key>
 	<string>Emacs.icns</string>
 	<key>CFBundleIdentifier</key>
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings	Sun Jan 10 22:34:14 2010 +0800
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings	Mon Jan 11 22:34:47 2010 +0800
@@ -3,4 +3,4 @@
 CFBundleName = "Emacs";
 CFBundleShortVersionString = "Version 23.1.91";
 CFBundleGetInfoString = "Emacs version 23.1.91, NS Windowing";
-NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc.";
+NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist	Sun Jan 10 22:34:14 2010 +0800
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist	Mon Jan 11 22:34:47 2010 +0800
@@ -11,7 +11,7 @@
 	"Carl Edman (NeXTStep)",
 	"..see http://emacs-app.sf.net/authorship.html"
     );
-    Copyright = "Copyright (C) 2009 Free Software Foundation, Inc.";
+    Copyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
     FullVersionID = "Emacs 23.1.91, NS Windowing";
     NSExecutable = Emacs;
--- a/src/ChangeLog	Sun Jan 10 22:34:14 2010 +0800
+++ b/src/ChangeLog	Mon Jan 11 22:34:47 2010 +0800
@@ -1,3 +1,9 @@
+2010-01-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* xfns.c (x_set_menu_bar_lines) [!USE_X_TOOLKIT && !USE_GTK]:
+	Clear areas that will not be updated after change of menu bar lines.
+	Clear the menu bar window's current matrix when the window gets empty.
+
 2010-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
 	* intervals.h, textprop.c (extend_property_ranges): Return value
--- a/src/xfns.c	Sun Jan 10 22:34:14 2010 +0800
+++ b/src/xfns.c	Mon Jan 11 22:34:47 2010 +0800
@@ -1317,7 +1317,43 @@
 #else /* not USE_X_TOOLKIT && not USE_GTK */
   FRAME_MENU_BAR_LINES (f) = nlines;
   change_window_heights (f->root_window, nlines - olines);
-#endif /* not USE_X_TOOLKIT */
+
+  /* If the menu bar height gets changed, the internal border below
+     the top margin has to be cleared.  Also, if the menu bar gets
+     larger, the area for the added lines has to be cleared except for
+     the first menu bar line that is to be drawn later.  */
+  if (nlines != olines)
+    {
+      int height = FRAME_INTERNAL_BORDER_WIDTH (f);
+      int width = FRAME_PIXEL_WIDTH (f);
+      int y;
+
+      /* height can be zero here. */
+      if (height > 0 && width > 0)
+	{
+	  y = FRAME_TOP_MARGIN_HEIGHT (f);
+
+	  BLOCK_INPUT;
+	  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+			0, y, width, height, False);
+	  UNBLOCK_INPUT;
+	}
+
+      if (nlines > 1 && nlines > olines)
+	{
+	  y = (olines == 0 ? 1 : olines) * FRAME_LINE_HEIGHT (f);
+	  height = nlines * FRAME_LINE_HEIGHT (f) - y;
+
+	  BLOCK_INPUT;
+	  x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+			0, y, width, height, False);
+	  UNBLOCK_INPUT;
+	}
+
+      if (nlines == 0 && WINDOWP (f->menu_bar_window))
+	clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix);
+    }
+#endif /* not USE_X_TOOLKIT && not USE_GTK */
   adjust_glyphs (f);
 }