conflict resolve

7 files changed, 58 insertions, 9 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index dfbefedc323..3468e70386d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,24 @@
+2013-03-21  Eric Ludlam  <zappo@gnu.org>
+
+        * srecode/ede-autoconf.srt: Change Copyright to FSF.
+        (ede-empty): Change AC_INIT to use PROJECT_NAME, and
+        PROJECT_VERSION.
+
+        * srecode/ede-make.srt (ede-empty): Add a dependency on :project.
+        Add header comment specifying the project's relative path.
+
+        * srecode/c.srt (header_guard): Upcase the filename symbol.
+
+2013-03-21  Vladimir Kazanov <vkazanov@inbox.ru>
+
+        * srecode/java.srt (empty-main): New.
+        (class-tag): Decapitalize class.
+
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
+        * PROBLEMS: Mention problem with ImageMagick 6.8.2-3 through 6.8.3-9.
+
 2013-03-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         Add coding tags for iso-2022-7bit files that are not already tagged.
diff --git a/etc/NEWS b/etc/NEWS
index a4691f7f181..1947797bd34 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -174,6 +174,12 @@ When toggling, it restores the frame's previous window configuration.
 It also has an optional frame argument, which can be used by Lisp
 callers to fit the image to a frame other than the selected frame.
 
+** Info
+
+*** New face `info-index-match' is used to highlight matches in index
+entries displayed by `Info-index-next', `Info-virtual-index' and
+`info-apropos'.
+
 ** Isearch
 
 *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index b38a1240540..8cc70115037 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -206,6 +206,10 @@ added a line like this at the beginning of files of Lisp code:
 If your tar has this problem, install GNU tar--if you can manage to
 untar it :-).
 
+** Emacs can crash when displaying PNG images with transparency.
+This is due to a bug introduced in ImageMagick 6.8.2-3.  The bug
+should be fixed in ImageMagick 6.8.3-10.  Please see Bug#13867.
+
 ** Crashes when displaying GIF images in Emacs built with version
 libungif-4.1.0 are resolved by using version libungif-4.1.0b1.
 Configure checks for the correct version, but this problem could occur
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index 6c7139f3184..479f5c9b33d 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -46,12 +46,12 @@ template empty :time :user :file :c
 
 template header_guard :file :blank
 ----
-#ifndef {{FILENAME_SYMBOL}}
-#define {{FILENAME_SYMBOL}} 1
+#ifndef {{FILENAME_SYMBOL:upcase}}
+#define {{FILENAME_SYMBOL:upcase}} 1
 
 {{^}}
 
-#endif // {{FILENAME_SYMBOL}}
+#endif // {{FILENAME_SYMBOL:upcase}}
 ----
 
 context misc
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
index d2ec61a0a93..b3aaa75d2c2 100644
--- a/etc/srecode/ede-autoconf.srt
+++ b/etc/srecode/ede-autoconf.srt
@@ -1,6 +1,6 @@
 ;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE.
 ;;
-;; Copyright (C) 2010 Eric M. Ludlam
+;; Copyright (C) 2010, 2013 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 ;;
@@ -26,7 +26,7 @@ set application "ede"
 
 context file
 
-template ede-empty
+template ede-empty :project
 "Start a new EDE generated configure.in/ac file."
 ----
 {{comment_prefix}} Automatically Generated/Maintained {{FILE}} by EDE.
@@ -40,7 +40,7 @@ template ede-empty
 {{comment_prefix}}
 {{comment_prefix}} Process this file with autoconf to produce a configure script
 
-AC_INIT({{TEST_FILE}})
+AC_INIT({{PROJECT_NAME}}, {{PROJECT_VERSION}})
 AM_INIT_AUTOMAKE([{{PROGRAM}}], 0)
 AM_CONFIG_HEADER(config.h)
 
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index f12744e89b7..36bae085cc9 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -26,10 +26,11 @@ set application "ede"
 
 context file
 
-template ede-empty :file
+template ede-empty :file :project
 ----
 # Automatically Generated {{FILE}} by EDE.
 # For use with: {{MAKETYPE}}
+# Relative File Name: {{PROJECT_FILENAME}}
 #
 # DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
 # EDE is the Emacs Development Environment.
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index a4a6fc2e863..e1fbb50eff6 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -43,6 +43,23 @@ package {{FILENAME_AS_PACKAGE}};
 ----
 bind "e"
 
+template empty-main :file :user :time :java :indent
+"Fill out an empty file with a class having a static main method"
+sectiondictionary "CLASSSECTION"
+set NAME macro "FILENAME_AS_CLASS"
+----
+{{>:filecomment}}
+
+package {{FILENAME_AS_PACKAGE}};
+
+{{<CLASSSECTION:declaration:class}}
+public static void main(String args[]) {
+       {{^}}
+}
+{{/CLASSSECTION}}
+----
+bind "l"
+
 context declaration
 
 template import :blank :indent
@@ -74,8 +91,8 @@ Override this to affect applications, or the outer class structure for
 the user-facing template."
 ----
 {{>:declaration:javadoc-class}}
-public Class {{?NAME}} {{#PARENTS}}{{#FIRST}}extends {{/FIRST}}{{#NOTFIRST}}implements {{/NOTFIRST}}{{NAME}}{{/PARENTS}}
-{     
+public class {{?NAME}} {{#PARENTS}}{{#FIRST}}extends {{/FIRST}}{{#NOTFIRST}}implements {{/NOTFIRST}}{{NAME}}{{/PARENTS}}
+{
    {{^}}
 };
 ----