annotate etc/emacs.py @ 111440:b72ff43b041f

* lisp/emacs-lisp/smie.el: Simplify the smie-rules-function return values. (smie-precs->prec2): Rename from smie-precs-precedence-table. (smie-bnf->prec2): Rename from smie-bnf-precedence-table. (smie-prec2->grammar): Rename from smie-prec2-levels. (smie-grammar): Rename from smie-op-levels. (smie-indent--hanging-p): Rename from smie-hanging-p. (smie-rule-hanging-p): New alias. (smie-indent--bolp): Rename from smie-bolp. (smie-indent--hanging-p): New alias. (smie--token): New dynamically bound variable. (smie-indent--parent): New function. (smie-rule-parent-p): Use it; rename from smie-parent-p. (smie-rule-next-p): Rename from smie-next-p. (smie-rule-prev-p): Rename from smie-prev-p. (smie-rule-sibling-p, smie-rule-parent) (smie-indent--separator-outdent, smie-rule-separator): New functions. (smie-rule-separator-outdent): New var. (smie-indent--rule): Merge with smie-indent--column. (smie-indent-forward-token, smie-indent-backward-token): Also recognize close parens. (smie-indent-keyword): Don't use smie-indent--column any more. (smie-indent-after-keyword): Ignore closers by default. (smie-indent-line): Use with-demoted-errors. * lisp/progmodes/octave-mod.el (octave-smie-grammar): Rename from octave-smie-op-levels. (octave-smie-rules): Adjust to new behavior. * lisp/progmodes/prolog.el (prolog-smie-grammar): Rename from prolog-smie-op-levels.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 07 Nov 2010 10:45:45 -0500
parents 69c173eabff4
children bdb3fe0ba9fa ef719132ddfa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
84823
9b1c9000269c Adam Hupp <adam at hupp.org>
Glenn Morris <rgm@gnu.org>
parents: 78271
diff changeset
1 """Wrapper for version-specific implementations of python.el helper
9b1c9000269c Adam Hupp <adam at hupp.org>
Glenn Morris <rgm@gnu.org>
parents: 78271
diff changeset
2 functions """
77605
b4b0e39a8d1f Restore file pending consideration of python.el legal status.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
3
84823
9b1c9000269c Adam Hupp <adam at hupp.org>
Glenn Morris <rgm@gnu.org>
parents: 78271
diff changeset
4 import sys
77605
b4b0e39a8d1f Restore file pending consideration of python.el legal status.
Glenn Morris <rgm@gnu.org>
parents:
diff changeset
5
84823
9b1c9000269c Adam Hupp <adam at hupp.org>
Glenn Morris <rgm@gnu.org>
parents: 78271
diff changeset
6 if sys.version_info[0] == 3:
9b1c9000269c Adam Hupp <adam at hupp.org>
Glenn Morris <rgm@gnu.org>
parents: 78271
diff changeset
7 from emacs3 import *
9b1c9000269c Adam Hupp <adam at hupp.org>
Glenn Morris <rgm@gnu.org>
parents: 78271
diff changeset
8 else:
9b1c9000269c Adam Hupp <adam at hupp.org>
Glenn Morris <rgm@gnu.org>
parents: 78271
diff changeset
9 from emacs2 import *
84885
69c173eabff4 Add arch tagline
Miles Bader <miles@gnu.org>
parents: 84823
diff changeset
10
69c173eabff4 Add arch tagline
Miles Bader <miles@gnu.org>
parents: 84823
diff changeset
11 # arch-tag: 894b5227-638f-45fd-8567-0417d5c35900