Merge from origin/emacs-25

[gnu-emacs] / lisp / progmodes / prog-mode.el

diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index 2f12df4772395db1d5bde3316756a4ba0bc86485..718b33932eda18d0267fb0ce2842674989fa646d 100644 (file)
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -202,6 +202,7 @@ is immediately after the symbol.  The prettification will be
 reapplied as soon as point moves away from the symbol.  If
 set to nil, the prettification persists even when point is
 on the symbol."
+  :version "25.1"
   :type '(choice (const :tag "Never unprettify" nil)
                  (const :tag "Unprettify when point is inside" t)
                  (const :tag "Unprettify when point is inside or at right edge" right-edge))