Emacs 24.3 with emacs-24.3-mac-4.7

fgeller · Mar 5, 2014 · 4ac93f8 · 4ac93f8
1 parent 7fc1e2a
commit 4ac93f8
Show file tree

Hide file tree

Showing 22 changed files with 163 additions and 185 deletions.
diff --git a/NEWS-mac b/NEWS-mac
@@ -1,4 +1,26 @@
+* emacs-24.3-mac-4.7 (2014-02-27)
+
+** Fixed bugs
+
+*** Crash if a fullscreen frame is closed by C-x 5 0.
+This is a regression introduced in 4.5 as the fix for invisible
+animation effects on OS X 10.9.
+
+*** M-x menu-bar-open RET always activates the menu bar in the primary
+monitor on OS X 10.9 where a non-primary monitor can also have a menu
+bar.
+
+*** Command-Shift-/ does not activate the help menu for a fullscreen
+frame on OS X 10.8 and later.
+
+** Improvements
+
+*** Moving focus to the menu bar by Control-F2 behaves much like other
+applications.
+
+
 * emacs-24.3-mac-4.6 (2013-12-27)
+http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00952.html
 
 ** Fixed bugs
 

diff --git a/README.md b/README.md
@@ -72,6 +72,9 @@ https://gist.github.com/3498096
 
 ## Changelog ##
 
+#### 03/05/2014 ####
+  * Emacs 24.3    with emacs-24.3-mac-4.7
+
 #### 12/31/2013 ####
   * Emacs 24.3    with emacs-24.3-mac-4.6
   * add a more modern looking icon, PR #37. (Thanks, @tpanum)

diff --git a/aclocal.m4 b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.14 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

diff --git a/doc/emacs/macport.texi b/doc/emacs/macport.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs Mac port manual.
 @c Copyright (C) 2000-2008 Free Software Foundation, Inc.
-@c Copyright (C) 2012-2013  YAMAMOTO Mitsuharu
+@c Copyright (C) 2012-2014  YAMAMOTO Mitsuharu
 @c See file emacs.texi for copying conditions.
 @node Mac Port
 @appendix Emacs and Mac OS X with the Mac port

diff --git a/lib/Makefile.in b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.14 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.

diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
@@ -1,7 +1,7 @@
 ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8-*-
 
 ;; Copyright (C) 1999-2008  Free Software Foundation, Inc.
-;; Copyright (C) 2009-2013  YAMAMOTO Mitsuharu
+;; Copyright (C) 2009-2014  YAMAMOTO Mitsuharu
 
 ;; Author: Andrew Choi <akochoi@mac.com>
 ;;	YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>

diff --git a/mac/Emacs.app/Contents/MacOS/Emacs.sh b/mac/Emacs.app/Contents/MacOS/Emacs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ### Emacs.sh - GNU Emacs Mac port startup script.
 
-## Copyright (C) 2012-2013  YAMAMOTO Mitsuharu
+## Copyright (C) 2012-2014  YAMAMOTO Mitsuharu
 
 ## This file is part of GNU Emacs Mac port.
 

diff --git a/mac/Makefile.in b/mac/Makefile.in
@@ -1,6 +1,6 @@
 ### mac/Makefile for GNU Emacs Mac port
 
-## Copyright (C) 2012-2013  YAMAMOTO Mitsuharu
+## Copyright (C) 2012-2014  YAMAMOTO Mitsuharu
 
 ## This file is part of GNU Emacs Mac port.
 

diff --git a/mac/templates/Info.plist.in b/mac/templates/Info.plist.in
@@ -1,7 +1,7 @@
 <!--
 Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008
   Free Software Foundation, Inc.
-Copyright (C) 2009-2013  YAMAMOTO Mitsuharu
+Copyright (C) 2009-2014  YAMAMOTO Mitsuharu
 
 This file is part of GNU Emacs Mac port.
 

diff --git a/src/composite.c b/src/composite.c
@@ -1443,7 +1443,7 @@ composition_update_it (struct composition_it *cmp_it, ptrdiff_t charpos, ptrdiff
       cmp_it->width = 0;
       for (i = cmp_it->nchars - 1; i >= 0; i--)
 	{
-	  c = XINT (LGSTRING_CHAR (gstring, i));
+	  c = XINT (LGSTRING_CHAR (gstring, from + i));
 	  cmp_it->nbytes += CHAR_BYTES (c);
 	  cmp_it->width += CHAR_WIDTH (c);
 	}

diff --git a/src/keyboard.h b/src/keyboard.h
@@ -359,7 +359,7 @@ extern Lisp_Object unuse_menu_items (Lisp_Object dummy);
 #define ENCODE_MENU_STRING(str) (str)
 #endif
 
-#if defined (HAVE_NS) || defined (HAVE_NTGUI) || defined (USE_GTK)
+#if defined (HAVE_MACGUI) || defined (HAVE_NS) || defined (HAVE_NTGUI) || defined (USE_GTK)
 
 /* Definitions copied from lwlib.h */
 

diff --git a/src/mac.c b/src/mac.c
@@ -1,6 +1,6 @@
 /* Unix emulation routines for GNU Emacs on the Mac OS.
    Copyright (C) 2000-2008  Free Software Foundation, Inc.
-   Copyright (C) 2009-2013  YAMAMOTO Mitsuharu
+   Copyright (C) 2009-2014  YAMAMOTO Mitsuharu
 
 This file is part of GNU Emacs Mac port.
 

diff --git a/src/macappkit.h b/src/macappkit.h
@@ -1,5 +1,5 @@
 /* Definitions and headers for AppKit framework on the Mac OS.
-   Copyright (C) 2008-2013  YAMAMOTO Mitsuharu
+   Copyright (C) 2008-2014  YAMAMOTO Mitsuharu
 
 This file is part of GNU Emacs Mac port.