(python-indent): Add safe-local-variable prop.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc4eee83553aa71ed7b6f7f64b2cff0164576cc8..df8e9da2604ab9175891754e91710192d994e2cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2006-12-04  Richard Stallman  <rms@gnu.org>
+
+       * progmodes/python.el (python-indent): Add safe-local-variable prop.
+
+       * dired.el (dired-revert): Turn off dired-after-readin-hook
+       around call to dired-readin.
+
+       * menu-bar.el (menu-bar-make-toggle): Add "globally"
+       to echo area messages.
+       <indicate-empty-lines, case-fold-search>:
+       Add "globally" to Help string.
+       <case-fold-search>: MESSAGE arg need not say "globally".
+       (menu-bar-edit-menu <paste-from-menu>): Renamed from select-and-paste.
+
+2006-12-03  Liam Healy  <lnp@healy.washington.dc.us>  (tiny change)
+
+       * outline.el (outline-end-of-subtree): Don't leave an empty
+       line hidden as we would a real next heading.
+
 2006-12-03  Ken Manheimer  <ken.manheimer@gmail.com>
 
        * allout.el (allout-ascend): Add an optional argument to preserve
@@ -76,7 +95,12 @@
 
        * descr-text.el (describe-char-unicodedata-file): Fix typo in docstring.
 
+<<<<<<< ChangeLog
+>>>>>>> 1.10388
+2006-12-01  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+=======
 2006-12-01  Ben North  <ben@redfrontdoor.org>
+>>>>>>> 1.10392
 
        * paren.el: Fix the highlight overlay extension when the user types a
        sequence of char very fast just before the open parenthesis.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 24e9f65f180d7bb4d446d1749801a746b5c68f05..7a62cfa477c84e35238d0c4d5814857c85cd83fc 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -408,6 +408,7 @@ The criteria are that the line isn't a comment or in string and
 See also `\\[python-guess-indent]'"
   :group 'python
   :type 'integer)
+(put 'python-indent 'safe-local-variable 'integerp)
 
 (defcustom python-guess-indent t
   "Non-nil means Python mode guesses `python-indent' for the buffer."