Hi,
had to move `py-mode-syntax-table' still upward in file.
Now no complaining any more.
Thanks being patient...
Andreas
11a12
>
387a389,487
> ;; 2009-09-10 a.roeh...@web.de changed section start
> ;; from python.el, version "22.1"
>
> (defconst python-font-lock-syntactic-keywords
> ;; Make outer chars of matching triple-quote sequences into generic
> ;; string delimiters. Fixme: Is there a better way?
> ;; First avoid a sequence preceded by an odd number of backslashes.
> `((,(rx (not (any ?\\))
> ?\\ (* (and ?\\ ?\\))
> (group (syntax string-quote))
> (backref 1)
> (group (backref 1)))
> (2 ,(string-to-syntax "\""))) ; dummy
> (,(rx (group (optional (any "uUrR"))) ; prefix gets syntax property
> (optional (any "rR")) ; possible second prefix
> (group (syntax string-quote)) ; maybe gets property
> (backref 2) ; per first quote
> (group (backref 2))) ; maybe gets property
> (1 (python-quote-syntax 1))
> (2 (python-quote-syntax 2))
> (3 (python-quote-syntax 3)))
> ;; This doesn't really help.
> ;;; (,(rx (and ?\\ (group ?\n))) (1 " "))
> ))
>
> (defun python-quote-syntax (n)
> "Put `syntax-table' property correctly on triple quote.
> Used for syntactic keywords. N is the match number (1, 2 or 3)."
> ;; Given a triple quote, we have to check the context to know
> ;; whether this is an opening or closing triple or whether it's
> ;; quoted anyhow, and should be ignored. (For that we need to do
> ;; the same job as `syntax-ppss' to be correct and it seems to be OK
> ;; to use it here despite initial worries.) We also have to sort
> ;; out a possible prefix -- well, we don't _have_ to, but I think it
> ;; should be treated as part of the string.
>
> ;; Test cases:
> ;; ur"""ar""" x='"' # """
> ;; x = ''' """ ' a
> ;; '''
> ;; x '"""' x """ \"""" x
> (save-excursion
> (goto-char (match-beginning 0))
> (cond
> ;; Consider property for the last char if in a fenced string.
> ((= n 3)
> (let* ((font-lock-syntactic-keywords nil)
> (syntax (syntax-ppss)))
> (when (eq t (nth 3 syntax)) ; after unclosed fence
> (goto-char (nth 8 syntax)) ; fence position
> (skip-chars-forward "uUrR") ; skip any prefix
> ;; Is it a matching sequence?
> (if (eq (char-after) (char-after (match-beginning 2)))
> (eval-when-compile (string-to-syntax "|"))))))
> ;; Consider property for initial char, accounting for prefixes.
> ((or (and (= n 2) ; leading quote (not prefix)
> (= (match-beginning 1) (match-end 1))) ; prefix is null
> (and (= n 1) ; prefix
> (/= (match-beginning 1) (match-end 1)))) ; non-empty
> (let ((font-lock-syntactic-keywords nil))
> (unless (eq 'string (syntax-ppss-context (syntax-ppss)))
> (eval-when-compile (string-to-syntax "|")))))
> ;; Otherwise (we're in a non-matching string) the property is
> ;; nil, which is OK.
> )))
>
>
> (defvar py-mode-syntax-table
> (let ((table (make-syntax-table)))
> ;; Give punctuation syntax to ASCII that normally has symbol
> ;; syntax or has word syntax and isn't a letter.
> (let ((symbol (string-to-syntax "_"))
> (sst (standard-syntax-table)))
> (dotimes (i 128)
> (unless (= i ?_)
> (if (equal symbol (aref sst i))
> (modify-syntax-entry i "." table)))))
> (modify-syntax-entry ?$ "." table)
> (modify-syntax-entry ?% "." table)
> ;; exceptions
> (modify-syntax-entry ?# "<" table)
> (modify-syntax-entry ?\n ">" table)
> (modify-syntax-entry ?' "\"" table)
> (modify-syntax-entry ?` "$" table)
> table))
>
> (defsubst python-in-string/comment ()
> "Return non-nil if point is in a Python literal (a comment or string)."
> ;; We don't need to save the match data.
> (nth 8 (syntax-ppss)))
>
> (defconst python-space-backslash-table
> (let ((table (copy-syntax-table py-mode-syntax-table)))
> (modify-syntax-entry ?\\ " " table)
> table)
> "`python-mode-syntax-table' with backslash given whitespace syntax.")
>
> ;; 2009-09-10 a.roeh...@web.de changed section end
>
508d607
< (put 'python-mode 'font-lock-defaults '(python-font-lock-keywords))
730,771c829,875
< (defvar py-mode-syntax-table nil
< "Syntax table used in `python-mode' buffers.")
< (when (not py-mode-syntax-table)
< (setq py-mode-syntax-table (make-syntax-table))
< (modify-syntax-entry ?\( "()" py-mode-syntax-table)
< (modify-syntax-entry ?\) ")(" py-mode-syntax-table)
< (modify-syntax-entry ?\[ "(]" py-mode-syntax-table)
< (modify-syntax-entry ?\] ")[" py-mode-syntax-table)
< (modify-syntax-entry ?\{ "(}" py-mode-syntax-table)
< (modify-syntax-entry ?\} "){" py-mode-syntax-table)
< ;; Add operator symbols misassigned in the std table
< (modify-syntax-entry ?\$ "." py-mode-syntax-table)
< (modify-syntax-entry ?\% "." py-mode-syntax-table)
< (modify-syntax-entry ?\& "." py-mode-syntax-table)
< (modify-syntax-entry ?\* "." py-mode-syntax-table)
< (modify-syntax-entry ?\+ "." py-mode-syntax-table)
< (modify-syntax-entry ?\- "." py-mode-syntax-table)
< (modify-syntax-entry ?\/ "." py-mode-syntax-table)
< (modify-syntax-entry ?\< "." py-mode-syntax-table)
< (modify-syntax-entry ?\= "." py-mode-syntax-table)
< (modify-syntax-entry ?\> "." py-mode-syntax-table)
< (modify-syntax-entry ?\| "." py-mode-syntax-table)
< ;; For historical reasons, underscore is word class instead of
< ;; symbol class. GNU conventions say it should be symbol class, but
< ;; there's a natural conflict between what major mode authors want
< ;; and what users expect from `forward-word' and `backward-word'.
< ;; Guido and I have hashed this out and have decided to keep
< ;; underscore in word class. If you're tempted to change it, try
< ;; binding M-f and M-b to py-forward-into-nomenclature and
< ;; py-backward-into-nomenclature instead. This doesn't help in all
< ;; situations where you'd want the different behavior
< ;; (e.g. backward-kill-word).
< (modify-syntax-entry ?\_ "w" py-mode-syntax-table)
< ;; Both single quote and double quote are string delimiters
< (modify-syntax-entry ?\' "\"" py-mode-syntax-table)
< (modify-syntax-entry ?\" "\"" py-mode-syntax-table)
< ;; backquote is open and close paren
< (modify-syntax-entry ?\` "$" py-mode-syntax-table)
< ;; comment delimiters
< (modify-syntax-entry ?\# "<" py-mode-syntax-table)
< (modify-syntax-entry ?\n ">" py-mode-syntax-table)
< )
---
> ;; 2009-09-09 a.roeh...@web.de changed section start
> ;; from python.el, version "22.1"
>
> ;; (defvar py-mode-syntax-table nil
> ;; "Syntax table used in `python-mode' buffers.")
> ;; (when (not py-mode-syntax-table)
> ;; (setq py-mode-syntax-table (make-syntax-table))
> ;; (modify-syntax-entry ?\( "()" py-mode-syntax-table)
> ;; (modify-syntax-entry ?\) ")(" py-mode-syntax-table)
> ;; (modify-syntax-entry ?\[ "(]" py-mode-syntax-table)
> ;; (modify-syntax-entry ?\] ")[" py-mode-syntax-table)
> ;; (modify-syntax-entry ?\{ "(}" py-mode-syntax-table)
> ;; (modify-syntax-entry ?\} "){" py-mode-syntax-table)
> ;; ;; Add operator symbols misassigned in the std table
> ;; (modify-syntax-entry ?\$ "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\% "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\& "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\* "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\+ "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\- "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\/ "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\< "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\= "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\> "." py-mode-syntax-table)
> ;; (modify-syntax-entry ?\| "." py-mode-syntax-table)
> ;; ;; For historical reasons, underscore is word class instead of
> ;; ;; symbol class. GNU conventions say it should be symbol class, but
> ;; ;; there's a natural conflict between what major mode authors want
> ;; ;; and what users expect from `forward-word' and `backward-word'.
> ;; ;; Guido and I have hashed this out and have decided to keep
> ;; ;; underscore in word class. If you're tempted to change it, try
> ;; ;; binding M-f and M-b to py-forward-into-nomenclature and
> ;; ;; py-backward-into-nomenclature instead. This doesn't help in all
> ;; ;; situations where you'd want the different behavior
> ;; ;; (e.g. backward-kill-word).
> ;; (modify-syntax-entry ?\_ "w" py-mode-syntax-table)
> ;; ;; Both single quote and double quote are string delimiters
> ;; (modify-syntax-entry ?\' "\"" py-mode-syntax-table)
> ;; (modify-syntax-entry ?\" "\"" py-mode-syntax-table)
> ;; ;; backquote is open and close paren
> ;; (modify-syntax-entry ?\` "$" py-mode-syntax-table)
> ;; ;; comment delimiters
> ;; (modify-syntax-entry ?\# "<" py-mode-syntax-table)
> ;; (modify-syntax-entry ?\n ">" py-mode-syntax-table)
> ;;
> ;; )
> ;; 2009-09-09 a.roeh...@web.de changed section end
1164d1267
<
1167d1269
<
1171d1272
<
1180c1281
< (make-local-variable 'font-lock-defaults)
---
> ;; (make-local-variable 'font-lock-defaults)
1195,1205c1296,1315
< (setq major-mode 'python-mode
< mode-name "Python"
< local-abbrev-table python-mode-abbrev-table
< font-lock-defaults '(python-font-lock-keywords)
< paragraph-separate "^[ \t]*$"
< paragraph-start "^[ \t]*$"
< require-final-newline t
< comment-start "# "
< comment-end ""
< comment-start-skip "# *"
< comment-column 40
---
> ;; 2009-09-10 a.roeh...@web.de changed section start
> ;; from python.el, version "22.1"
> (set (make-local-variable 'font-lock-defaults)
> '(python-font-lock-keywords nil nil nil nil
> (font-lock-syntactic-keywords
> . python-font-lock-syntactic-keywords)))
> ;; 2009-09-10 a.roeh...@web.de changed section end
> (setq major-mode 'python-mode
> mode-name "Python"
> local-abbrev-table python-mode-abbrev-table
> ;; 2009-09-10 a.roeh...@web.de changed section start
> ;; font-lock-defaults ...
> ;; 2009-09-10 a.roeh...@web.de changed section end
> paragraph-separate "^[ \t]*$"
> paragraph-start "^[ \t]*$"
> require-final-newline t
> comment-start "# "
> comment-end ""
> comment-start-skip "# *"
> comment-column 40
1207,1208c1317,1318
< indent-region-function 'py-indent-region
< indent-line-function 'py-indent-line
---
> indent-region-function 'py-indent-region
> indent-line-function 'py-indent-line
1211,1213c1321
<
< fill-paragraph-function 'py-fill-paragraph
< )
---
> fill-paragraph-function 'py-fill-paragraph)
1226,1227c1334
< (imenu-add-to-menubar (format "%s-%s" "IM" mode-name)))
< )
---
> (imenu-add-to-menubar (format "%s-%s" "IM" mode-name))))
1234,1246c1341,1352
< (let ((offset py-indent-offset))
< ;; It's okay if this fails to guess a good value
< (if (and (py-safe (py-guess-indent-offset))
< (<= py-indent-offset 8)
< (>= py-indent-offset 2))
< (setq offset py-indent-offset))
< (setq py-indent-offset offset)
< ;; Only turn indent-tabs-mode off if tab-width !=
< ;; py-indent-offset. Never turn it on, because the user must
< ;; have explicitly turned it off.
< (if (/= tab-width py-indent-offset)
< (setq indent-tabs-mode nil))
< ))
---
> (let ((offset py-indent-offset))
> ;; It's okay if this fails to guess a good value
> (if (and (py-safe (py-guess-indent-offset))
> (<= py-indent-offset 8)
> (>= py-indent-offset 2))
> (setq offset py-indent-offset))
> (setq py-indent-offset offset)
> ;; Only turn indent-tabs-mode off if tab-width !=
> ;; py-indent-offset. Never turn it on, because the user must
> ;; have explicitly turned it off.
> (if (/= tab-width py-indent-offset)
> (setq indent-tabs-mode nil))))
_______________________________________________
Python-mode mailing list
Python-mode@python.org
http://mail.python.org/mailman/listinfo/python-mode
