Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f46305c8
Commit
f46305c8
authored
Jun 01, 2013
by
Glenn Morris
Browse files
Merge from emacs-24; up to 2012-12-27T20:09:45Z!juri@jurta.org
parents
9133b82e
20992a85
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
3 deletions
+13
-3
doc/emacs/ChangeLog
doc/emacs/ChangeLog
+4
-0
doc/emacs/programs.texi
doc/emacs/programs.texi
+1
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/progmodes/python.el
lisp/progmodes/python.el
+3
-2
No files found.
doc/emacs/ChangeLog
View file @
f46305c8
2013-06-01 Glenn Morris <rgm@gnu.org>
* programs.texi (Semantic): Fix typo.
2013-05-30 Xue Fuqiao <xfq.free@gmail.com>
2013-05-30 Xue Fuqiao <xfq.free@gmail.com>
* maintaining.texi (Types of Log File): Supplement some
* maintaining.texi (Types of Log File): Supplement some
...
...
doc/emacs/programs.texi
View file @
f46305c8
...
@@ -1356,7 +1356,7 @@ the menu item named @samp{Source Code Parsers (Semantic)} in the
...
@@ -1356,7 +1356,7 @@ the menu item named @samp{Source Code Parsers (Semantic)} in the
@samp{Tools} menu. This enables Semantic mode, a global minor mode.
@samp{Tools} menu. This enables Semantic mode, a global minor mode.
When Semantic mode is enabled, Emacs automatically attempts to
When Semantic mode is enabled, Emacs automatically attempts to
parse
s
each file you visit. Currently, Semantic understands C, C++,
parse each file you visit. Currently, Semantic understands C, C++,
Scheme, Javascript, Java, HTML, and Make. Within each parsed buffer,
Scheme, Javascript, Java, HTML, and Make. Within each parsed buffer,
the following commands are available:
the following commands are available:
...
...
lisp/ChangeLog
View file @
f46305c8
2013-06-01 Fabián Ezequiel Gallina <fgallina@gnu.org>
* progmodes/python.el (python-indent-block-enders): Add break,
continue and raise keywords.
2013-06-01 Glenn Morris <rgm@gnu.org>
2013-06-01 Glenn Morris <rgm@gnu.org>
* pcmpl-gnu.el (pcomplete/tar): Check obsolete variable is bound.
* pcmpl-gnu.el (pcomplete/tar): Check obsolete variable is bound.
...
...
lisp/progmodes/python.el
View file @
f46305c8
...
@@ -157,7 +157,7 @@
...
@@ -157,7 +157,7 @@
;; Skeletons: 6 skeletons are provided for simple inserting of class,
;; Skeletons: 6 skeletons are provided for simple inserting of class,
;; def, for, if, try and while. These skeletons are integrated with
;; def, for, if, try and while. These skeletons are integrated with
;;
d
abbrev. If you have `
d
abbrev-mode' activated and
;; abbrev. If you have `abbrev-mode' activated and
;; `python-skeleton-autoinsert' is set to t, then whenever you type
;; `python-skeleton-autoinsert' is set to t, then whenever you type
;; the name of any of those defined and hit SPC, they will be
;; the name of any of those defined and hit SPC, they will be
;; automatically expanded. As an alternative you can use the defined
;; automatically expanded. As an alternative you can use the defined
...
@@ -642,7 +642,8 @@ It makes underscores and dots word constituent chars.")
...
@@ -642,7 +642,8 @@ It makes underscores and dots word constituent chars.")
These make `python-indent-calculate-indentation' subtract the value of
These make `python-indent-calculate-indentation' subtract the value of
`python-indent-offset'."
)
`python-indent-offset'."
)
(defvar python-indent-block-enders '("return" "pass")
(
defvar
python-indent-block-enders
'
(
"break"
"continue"
"pass"
"raise"
"return"
)
"List of words that mark the end of a block.
"List of words that mark the end of a block.
These make `python-indent-calculate-indentation' subtract the
These make `python-indent-calculate-indentation' subtract the
value of `python-indent-offset' when `python-indent-context' is
value of `python-indent-offset' when `python-indent-context' is
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment