[svn] gcry - r1423 - in trunk: . src

[svn author wk]

Author: wk
Date: 2010-03-15 13:27:29 +0100 (Mon, 15 Mar 2010)
New Revision: 1423

Modified:
   trunk/ChangeLog
   trunk/THANKS
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/gcrypt.h.in
Log:
Help not to edit a generated buffer.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-02-22 11:35:38 UTC (rev 1422)
+++ trunk/ChangeLog	2010-03-15 12:27:29 UTC (rev 1423)
@@ -1,3 +1,8 @@
+2010-03-15  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (emacs_local_vars_begin)
+	(emacs_local_vars_read_only, emacs_local_vars_end): New.
+
 2010-01-21  Werner Koch  <wk at g10code.com>
 
 	* compat/Makefile.am: New.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-02-22 11:35:38 UTC (rev 1422)
+++ trunk/src/ChangeLog	2010-03-15 12:27:29 UTC (rev 1423)
@@ -1,3 +1,8 @@
+2010-03-15  Werner Koch  <wk at g10code.com>
+
+	* gcrypt.h.in: Add autoconf template to set generated file to
+	read-only in an Emacs buffer.
+
 2010-01-21  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (arch_gpg_error_cflags, arch_gpg_error_libs): New.

Modified: trunk/THANKS
===================================================================
--- trunk/THANKS	2010-02-22 11:35:38 UTC (rev 1422)
+++ trunk/THANKS	2010-03-15 12:27:29 UTC (rev 1423)
@@ -7,6 +7,7 @@
 Anand Kumria		   wildfire at progsoc.uts.edu.au
 Andreas Metzler            ametzler at downhill.at.eu.org
 Ariel T Glenn		   ariel at columbia.edu
+Aurelien Jarno             aurel32 at debian.org
 Ben Hutchings              ben decadent org uk
 Bodo Moeller		   Bodo_Moeller at public.uni-hamburg.de
 Brenno de Winter	   brenno at dewinter.com

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2010-02-22 11:35:38 UTC (rev 1422)
+++ trunk/configure.ac	2010-03-15 12:27:29 UTC (rev 1423)
@@ -31,8 +31,11 @@
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
+m4_define([git_revision], m4_esyscmd([git branch -v 2>/dev/null \
+          | awk '/^\* / {printf "%s",$3}']))
 AC_INIT([libgcrypt], 
-        [my_version[]m4_if(my_issvn,[yes],[-svn[]svn_revision])],
+        [my_version[]m4_if(my_issvn,[yes],
+        [m4_if(git_revision,[],[-svn[]svn_revision],[-git[]git_revision])])],
         [bug-libgcrypt at gnupg.org])
 # LT Version numbers, remember to change them just *before* a release.
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
@@ -1140,7 +1143,12 @@
                    [Subversion revision used to build this package])
 
 
+# Substitutions to set generated files in a Emacs buffer to read-only.
+AC_SUBST(emacs_local_vars_begin, ['Local Variables:'])
+AC_SUBST(emacs_local_vars_read_only, ['buffer-read-only: t'])
+AC_SUBST(emacs_local_vars_end, ['End:'])
 
+
 # And create the files.
 AC_CONFIG_FILES([
 Makefile

Modified: trunk/src/gcrypt.h.in
===================================================================
--- trunk/src/gcrypt.h.in	2010-02-22 11:35:38 UTC (rev 1422)
+++ trunk/src/gcrypt.h.in	2010-03-15 12:27:29 UTC (rev 1423)
@@ -1831,3 +1831,8 @@
 }
 #endif
 #endif /* _GCRYPT_H */
+/*
+ at emacs_local_vars_begin@
+ at emacs_local_vars_read_only@
+ at emacs_local_vars_end@
+*/