------------------------------------------------------------ revno: 114902 fixes bug: http://debbugs.gnu.org/15788 committer: Jan D. branch nick: trunk timestamp: Sat 2013-11-02 08:58:54 +0100 message: * xfaces.c (check_lface_attrs, realize_default_face): Add LFACE_DISTANT_FOREGROUND_INDEX. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-02 02:11:37 +0000 +++ src/ChangeLog 2013-11-02 07:58:54 +0000 @@ -1,3 +1,8 @@ +2013-11-02 Jan Djärv + + * xfaces.c (check_lface_attrs, realize_default_face): Add + LFACE_DISTANT_FOREGROUND_INDEX (Bug#15788). + 2013-11-02 Paul Eggert * emacs.c (original_pwd): Remove global var by making it local. === modified file 'src/xfaces.c' --- src/xfaces.c 2013-11-01 15:47:10 +0000 +++ src/xfaces.c 2013-11-02 07:58:54 +0000 @@ -1805,6 +1805,9 @@ eassert (UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) || IGNORE_DEFFACE_P (attrs[LFACE_FOREGROUND_INDEX]) || STRINGP (attrs[LFACE_FOREGROUND_INDEX])); + eassert (UNSPECIFIEDP (attrs[LFACE_DISTANT_FOREGROUND_INDEX]) + || IGNORE_DEFFACE_P (attrs[LFACE_DISTANT_FOREGROUND_INDEX]) + || STRINGP (attrs[LFACE_DISTANT_FOREGROUND_INDEX])); eassert (UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) || IGNORE_DEFFACE_P (attrs[LFACE_BACKGROUND_INDEX]) || STRINGP (attrs[LFACE_BACKGROUND_INDEX])); @@ -5352,6 +5355,9 @@ emacs_abort (); } + if (UNSPECIFIEDP (LFACE_DISTANT_FOREGROUND (lface))) + ASET (lface, LFACE_DISTANT_FOREGROUND_INDEX, Qnil); + if (UNSPECIFIEDP (LFACE_BACKGROUND (lface))) { /* This function is called so early that colors are not yet ------------------------------------------------------------ revno: 114901 committer: Dmitry Gutov branch nick: trunk timestamp: Sat 2013-11-02 09:18:11 +0400 message: * lisp/progmodes/ruby-mode.el (ruby-smie--rule-parent-skip-assign): New function, replacement for `smie-rule-parent' for when we want to skip over our direct parent if it's an assignment token.. (ruby-smie-rules): Use it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-02 01:10:10 +0000 +++ lisp/ChangeLog 2013-11-02 05:18:11 +0000 @@ -1,5 +1,12 @@ 2013-11-02 Dmitry Gutov + * progmodes/ruby-mode.el (ruby-smie--rule-parent-skip-assign): New + function, replacement for `smie-rule-parent' for when we want to + skip over our direct parent if it's an assignment token.. + (ruby-smie-rules): Use it. + +2013-11-02 Dmitry Gutov + * progmodes/ruby-mode.el Use `syntax-propertize-function' unconditionally. Remove now unnecessary forward declarations. Remove XEmacs-specific setup. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-02 01:10:10 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-02 05:18:11 +0000 @@ -467,6 +467,16 @@ (t ";"))) (t tok))))))) +(defun ruby-smie--rule-parent-skip-assign () + (let* ((parent (smie-indent--parent)) + (tok (caddr parent))) + (if (and (stringp tok) (string-match-p "[+-*&|^]?=\\'" tok)) + (progn + (goto-char (cadr parent)) + (let (smie--parent) + (smie-rule-parent))) + (smie-rule-parent)))) + (defun ruby-smie-rules (kind token) (pcase (cons kind token) (`(:elem . basic) ruby-indent-level) @@ -489,7 +499,7 @@ ((and (equal token "{") (not (smie-rule-prev-p "(" "{" "[" "," "=>" "=" "return" ";"))) ;; Curly block opener. - (smie-rule-parent)) + (ruby-smie--rule-parent-skip-assign)) ((smie-rule-hanging-p) ;; Treat purely syntactic block-constructs as being part of their parent, ;; when the opening statement is hanging. @@ -498,7 +508,7 @@ (cons 'column (smie-indent-virtual))))) (`(:after . ,(or "=" "iuwu-mod")) 2) (`(:after . " @ ") (smie-rule-parent)) - (`(:before . "do") (smie-rule-parent)) + (`(:before . "do") (ruby-smie--rule-parent-skip-assign)) (`(,(or :before :after) . ".") (unless (smie-rule-parent-p ".") (smie-rule-parent ruby-indent-level))) === modified file 'test/indent/ruby.rb' --- test/indent/ruby.rb 2013-10-27 03:25:03 +0000 +++ test/indent/ruby.rb 2013-11-02 05:18:11 +0000 @@ -225,6 +225,14 @@ bar end +a = b { + c +} + +aa = bb do + cc +end + # Examples below still fail with `ruby-use-smie' on: foo = [1, 2, 3].map do |i| ------------------------------------------------------------ revno: 114900 committer: Paul Eggert branch nick: trunk timestamp: Fri 2013-11-01 19:11:37 -0700 message: * emacs.c (original_pwd): Remove global var by making it local. (init_cmdargs): New arg ORIGINAL_PWD; caller changed. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-01 15:47:10 +0000 +++ src/ChangeLog 2013-11-02 02:11:37 +0000 @@ -1,3 +1,8 @@ +2013-11-02 Paul Eggert + + * emacs.c (original_pwd): Remove global var by making it local. + (init_cmdargs): New arg ORIGINAL_PWD; caller changed. + 2013-11-01 Jan Djärv * xfaces.c: Declare color_distance. === modified file 'src/emacs.c' --- src/emacs.c 2013-10-31 08:32:42 +0000 +++ src/emacs.c 2013-11-02 02:11:37 +0000 @@ -202,9 +202,6 @@ startup. */ int daemon_pipe[2]; -/* If we use --chdir, this records the original directory. */ -char *original_pwd; - /* Save argv and argc. */ char **initial_argv; int initial_argc; @@ -386,7 +383,7 @@ /* Code for dealing with Lisp access to the Unix command line. */ static void -init_cmdargs (int argc, char **argv, int skip_args) +init_cmdargs (int argc, char **argv, int skip_args, char *original_pwd) { register int i; Lisp_Object name, dir, handler; @@ -705,6 +702,9 @@ #endif char *ch_to_dir; + /* If we use --chdir, this records the original directory. */ + char *original_pwd = 0; + #if GC_MARK_STACK stack_base = &dummy; #endif @@ -794,7 +794,7 @@ if (argmatch (argv, argc, "-chdir", "--chdir", 4, &ch_to_dir, &skip_args)) { original_pwd = get_current_dir_name (); - if (chdir (ch_to_dir) == -1) + if (chdir (ch_to_dir) != 0) { fprintf (stderr, "%s: Can't chdir to %s: %s\n", argv[0], ch_to_dir, strerror (errno)); @@ -1330,7 +1330,9 @@ init_buffer (); /* Init default directory of main buffer. */ init_callproc_1 (); /* Must precede init_cmdargs and init_sys_modes. */ - init_cmdargs (argc, argv, skip_args); /* Must precede init_lread. */ + + /* Must precede init_lread. */ + init_cmdargs (argc, argv, skip_args, original_pwd); if (initialized) { ------------------------------------------------------------ revno: 114899 committer: Dmitry Gutov branch nick: trunk timestamp: Sat 2013-11-02 05:10:10 +0400 message: * lisp/progmodes/ruby-mode.el Use `syntax-propertize-function' unconditionally. Remove now unnecessary forward declarations. Remove XEmacs-specific setup. (ruby-here-doc-end-re, ruby-here-doc-beg-match) (ruby-font-lock-syntactic-keywords) (ruby-comment-beg-syntax, ruby-in-here-doc-p) (ruby-here-doc-find-end, ruby-here-doc-beg-syntax) (ruby-here-doc-end-syntax): Remove. (ruby-mode): Don't check whether `syntax-propertize-rules' is defined as function. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-02 00:17:54 +0000 +++ lisp/ChangeLog 2013-11-02 01:10:10 +0000 @@ -1,3 +1,16 @@ +2013-11-02 Dmitry Gutov + + * progmodes/ruby-mode.el Use `syntax-propertize-function' + unconditionally. Remove now unnecessary forward declarations. + Remove XEmacs-specific setup. + (ruby-here-doc-end-re, ruby-here-doc-beg-match) + (ruby-font-lock-syntactic-keywords) + (ruby-comment-beg-syntax, ruby-in-here-doc-p) + (ruby-here-doc-find-end, ruby-here-doc-beg-syntax) + (ruby-here-doc-end-syntax): Remove. + (ruby-mode): Don't check whether `syntax-propertize-rules' is + defined as function. + 2013-11-02 Bozhidar Batsov * progmodes/ruby-mode.el (ruby-mode-variables, ruby-mode): Use `setq-local'. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-02 00:17:54 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-02 01:10:10 +0000 @@ -1515,349 +1515,182 @@ (ruby-do-end-to-brace beg end))) (goto-char start)))) -(declare-function ruby-syntax-propertize-heredoc "ruby-mode" (limit)) -(declare-function ruby-syntax-enclosing-percent-literal "ruby-mode" (limit)) -(declare-function ruby-syntax-propertize-percent-literal "ruby-mode" (limit)) -;; Unusual code layout confuses the byte-compiler. -(declare-function ruby-syntax-propertize-expansion "ruby-mode" ()) -(declare-function ruby-syntax-expansion-allowed-p "ruby-mode" (parse-state)) -(declare-function ruby-syntax-propertize-function "ruby-mode" (start end)) - -(if (eval-when-compile (fboundp #'syntax-propertize-rules)) - ;; New code that works independently from font-lock. - (progn - (eval-and-compile - (defconst ruby-percent-literal-beg-re - "\\(%\\)[qQrswWxIi]?\\([[:punct:]]\\)" - "Regexp to match the beginning of percent literal.") - - (defconst ruby-syntax-methods-before-regexp - '("gsub" "gsub!" "sub" "sub!" "scan" "split" "split!" "index" "match" - "assert_match" "Given" "Then" "When") - "Methods that can take regexp as the first argument. +(eval-and-compile + (defconst ruby-percent-literal-beg-re + "\\(%\\)[qQrswWxIi]?\\([[:punct:]]\\)" + "Regexp to match the beginning of percent literal.") + + (defconst ruby-syntax-methods-before-regexp + '("gsub" "gsub!" "sub" "sub!" "scan" "split" "split!" "index" "match" + "assert_match" "Given" "Then" "When") + "Methods that can take regexp as the first argument. It will be properly highlighted even when the call omits parens.") - (defvar ruby-syntax-before-regexp-re - (concat - ;; Special tokens that can't be followed by a division operator. - "\\(^\\|[[=(,~;<>]" - ;; Distinguish ternary operator tokens. - ;; FIXME: They don't really have to be separated with spaces. - "\\|[?:] " - ;; Control flow keywords and operators following bol or whitespace. - "\\|\\(?:^\\|\\s \\)" - (regexp-opt '("if" "elsif" "unless" "while" "until" "when" "and" - "or" "not" "&&" "||")) - ;; Method name from the list. - "\\|\\_<" - (regexp-opt ruby-syntax-methods-before-regexp) - "\\)\\s *") - "Regexp to match text that can be followed by a regular expression.")) - - (defun ruby-syntax-propertize-function (start end) - "Syntactic keywords for Ruby mode. See `syntax-propertize-function'." - (let (case-fold-search) - (goto-char start) - (remove-text-properties start end '(ruby-expansion-match-data)) - (ruby-syntax-propertize-heredoc end) - (ruby-syntax-enclosing-percent-literal end) - (funcall - (syntax-propertize-rules - ;; $' $" $` .... are variables. - ;; ?' ?" ?` are character literals (one-char strings in 1.9+). - ("\\([?$]\\)[#\"'`]" - (1 (unless (save-excursion - ;; Not within a string. - (nth 3 (syntax-ppss (match-beginning 0)))) - (string-to-syntax "\\")))) - ;; Regular expressions. Start with matching unescaped slash. - ("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)" - (1 (let ((state (save-excursion (syntax-ppss (match-beginning 1))))) - (when (or - ;; Beginning of a regexp. - (and (null (nth 8 state)) - (save-excursion - (forward-char -1) - (looking-back ruby-syntax-before-regexp-re - (point-at-bol)))) - ;; End of regexp. We don't match the whole - ;; regexp at once because it can have - ;; string interpolation inside, or span - ;; several lines. - (eq ?/ (nth 3 state))) - (string-to-syntax "\"/"))))) - ;; Expression expansions in strings. We're handling them - ;; here, so that the regexp rule never matches inside them. - (ruby-expression-expansion-re - (0 (ignore (ruby-syntax-propertize-expansion)))) - ("^=en\\(d\\)\\_>" (1 "!")) - ("^\\(=\\)begin\\_>" (1 "!")) - ;; Handle here documents. - ((concat ruby-here-doc-beg-re ".*\\(\n\\)") - (7 (unless (or (nth 8 (save-excursion - (syntax-ppss (match-beginning 0)))) - (ruby-singleton-class-p (match-beginning 0))) - (put-text-property (match-beginning 7) (match-end 7) - 'syntax-table (string-to-syntax "\"")) - (ruby-syntax-propertize-heredoc end)))) - ;; Handle percent literals: %w(), %q{}, etc. - ((concat "\\(?:^\\|[[ \t\n<+(,=]\\)" ruby-percent-literal-beg-re) - (1 (prog1 "|" (ruby-syntax-propertize-percent-literal end))))) - (point) end))) - - (defun ruby-syntax-propertize-heredoc (limit) - (let ((ppss (syntax-ppss)) - (res '())) - (when (eq ?\n (nth 3 ppss)) - (save-excursion - (goto-char (nth 8 ppss)) - (beginning-of-line) - (while (re-search-forward ruby-here-doc-beg-re - (line-end-position) t) - (unless (ruby-singleton-class-p (match-beginning 0)) - (push (concat (ruby-here-doc-end-match) "\n") res)))) - (save-excursion - ;; With multiple openers on the same line, we don't know in which - ;; part `start' is, so we have to go back to the beginning. - (when (cdr res) - (goto-char (nth 8 ppss)) - (setq res (nreverse res))) - (while (and res (re-search-forward (pop res) limit 'move)) - (if (null res) - (put-text-property (1- (point)) (point) - 'syntax-table (string-to-syntax "\"")))) - ;; End up at bol following the heredoc openers. - ;; Propertize expression expansions from this point forward. - )))) - - (defun ruby-syntax-enclosing-percent-literal (limit) - (let ((state (syntax-ppss)) - (start (point))) - ;; When already inside percent literal, re-propertize it. - (when (eq t (nth 3 state)) - (goto-char (nth 8 state)) - (when (looking-at ruby-percent-literal-beg-re) - (ruby-syntax-propertize-percent-literal limit)) - (when (< (point) start) (goto-char start))))) - - (defun ruby-syntax-propertize-percent-literal (limit) - (goto-char (match-beginning 2)) - ;; Not inside a simple string or comment. - (when (eq t (nth 3 (syntax-ppss))) - (let* ((op (char-after)) - (ops (char-to-string op)) - (cl (or (cdr (aref (syntax-table) op)) - (cdr (assoc op '((?< . ?>)))))) - parse-sexp-lookup-properties) - (save-excursion - (condition-case nil - (progn - (if cl ; Paired delimiters. - ;; Delimiter pairs of the same kind can be nested - ;; inside the literal, as long as they are balanced. - ;; Create syntax table that ignores other characters. - (with-syntax-table (make-char-table 'syntax-table nil) - (modify-syntax-entry op (concat "(" (char-to-string cl))) - (modify-syntax-entry cl (concat ")" ops)) - (modify-syntax-entry ?\\ "\\") - (save-restriction - (narrow-to-region (point) limit) - (forward-list))) ; skip to the paired character - ;; Single character delimiter. - (re-search-forward (concat "[^\\]\\(?:\\\\\\\\\\)*" - (regexp-quote ops)) limit nil)) - ;; Found the closing delimiter. - (put-text-property (1- (point)) (point) 'syntax-table - (string-to-syntax "|"))) - ;; Unclosed literal, do nothing. - ((scan-error search-failed))))))) - - (defun ruby-syntax-propertize-expansion () - ;; Save the match data to a text property, for font-locking later. - ;; Set the syntax of all double quotes and backticks to punctuation. - (let* ((beg (match-beginning 2)) - (end (match-end 2)) - (state (and beg (save-excursion (syntax-ppss beg))))) - (when (ruby-syntax-expansion-allowed-p state) - (put-text-property beg (1+ beg) 'ruby-expansion-match-data - (match-data)) - (goto-char beg) - (while (re-search-forward "[\"`]" end 'move) - (put-text-property (match-beginning 0) (match-end 0) - 'syntax-table (string-to-syntax ".")))))) - - (defun ruby-syntax-expansion-allowed-p (parse-state) - "Return non-nil if expression expansion is allowed." - (let ((term (nth 3 parse-state))) - (cond - ((memq term '(?\" ?` ?\n ?/))) - ((eq term t) - (save-match-data - (save-excursion - (goto-char (nth 8 parse-state)) - (looking-at "%\\(?:[QWrxI]\\|\\W\\)"))))))) - - (defun ruby-syntax-propertize-expansions (start end) - (save-excursion - (goto-char start) - (while (re-search-forward ruby-expression-expansion-re end 'move) - (ruby-syntax-propertize-expansion)))) - ) - - ;; For Emacsen where syntax-propertize-rules is not (yet) available, - ;; fallback on the old font-lock-syntactic-keywords stuff. - - (defconst ruby-here-doc-end-re - "^\\([ \t]+\\)?\\(.*\\)\\(\n\\)" - "Regexp to match the end of heredocs. - -This will actually match any line with one or more characters. -It's useful in that it divides up the match string so that -`ruby-here-doc-beg-match' can search for the beginning of the heredoc.") - - (defun ruby-here-doc-beg-match () - "Return a regexp to find the beginning of a heredoc. - -This should only be called after matching against `ruby-here-doc-end-re'." - (let ((contents (concat - (regexp-quote (concat (match-string 2) (match-string 3))) - (if (string= (match-string 3) "_") "\\B" "\\b")))) - (concat "<<" - (let ((match (match-string 1))) - (if (and match (> (length match) 0)) - (concat "\\(?:-\\([\"']?\\)\\|\\([\"']\\)" - (match-string 1) "\\)" - contents "\\(\\1\\|\\2\\)") - (concat "-?\\([\"']\\|\\)" contents "\\1")))))) - - (defconst ruby-font-lock-syntactic-keywords - `( - ;; the last $', $", $` in the respective string is not variable - ;; the last ?', ?", ?` in the respective string is not ascii code - ("\\(^\\|[\[ \t\n<+\(,=]\\)\\(['\"`]\\)\\(\\\\.\\|\\2\\|[^'\"`\n\\\\]\\)*?\\\\?[?$]\\(\\2\\)" - (2 (7 . nil)) - (4 (7 . nil))) - ;; $' $" $` .... are variables - ;; ?' ?" ?` are ascii codes - ("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil)) - ;; regexps - ("\\(^\\|[[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)" - (4 (7 . ?/)) - (6 (7 . ?/))) - ("^=en\\(d\\)\\_>" 1 "!") - ;; Percent literal. - ("\\(^\\|[[ \t\n<+(,=]\\)\\(%[xrqQwW]?\\([^<[{(a-zA-Z0-9 \n]\\)[^\n\\\\]*\\(\\\\.[^\n\\\\]*\\)*\\(\\3\\)\\)" - (3 "\"") - (5 "\"")) - ("^\\(=\\)begin\\_>" 1 (ruby-comment-beg-syntax)) - ;; Currently, the following case is highlighted incorrectly: - ;; - ;; <]" + ;; Distinguish ternary operator tokens. + ;; FIXME: They don't really have to be separated with spaces. + "\\|[?:] " + ;; Control flow keywords and operators following bol or whitespace. + "\\|\\(?:^\\|\\s \\)" + (regexp-opt '("if" "elsif" "unless" "while" "until" "when" "and" + "or" "not" "&&" "||")) + ;; Method name from the list. + "\\|\\_<" + (regexp-opt ruby-syntax-methods-before-regexp) + "\\)\\s *") + "Regexp to match text that can be followed by a regular expression.")) + +(defun ruby-syntax-propertize-function (start end) + "Syntactic keywords for Ruby mode. See `syntax-propertize-function'." + (let (case-fold-search) + (goto-char start) + (remove-text-properties start end '(ruby-expansion-match-data)) + (ruby-syntax-propertize-heredoc end) + (ruby-syntax-enclosing-percent-literal end) + (funcall + (syntax-propertize-rules + ;; $' $" $` .... are variables. + ;; ?' ?" ?` are character literals (one-char strings in 1.9+). + ("\\([?$]\\)[#\"'`]" + (1 (unless (save-excursion + ;; Not within a string. + (nth 3 (syntax-ppss (match-beginning 0)))) + (string-to-syntax "\\")))) + ;; Regular expressions. Start with matching unescaped slash. + ("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)" + (1 (let ((state (save-excursion (syntax-ppss (match-beginning 1))))) + (when (or + ;; Beginning of a regexp. + (and (null (nth 8 state)) + (save-excursion + (forward-char -1) + (looking-back ruby-syntax-before-regexp-re + (point-at-bol)))) + ;; End of regexp. We don't match the whole + ;; regexp at once because it can have + ;; string interpolation inside, or span + ;; several lines. + (eq ?/ (nth 3 state))) + (string-to-syntax "\"/"))))) + ;; Expression expansions in strings. We're handling them + ;; here, so that the regexp rule never matches inside them. + (ruby-expression-expansion-re + (0 (ignore (ruby-syntax-propertize-expansion)))) + ("^=en\\(d\\)\\_>" (1 "!")) + ("^\\(=\\)begin\\_>" (1 "!")) + ;; Handle here documents. + ((concat ruby-here-doc-beg-re ".*\\(\n\\)") + (7 (unless (or (nth 8 (save-excursion + (syntax-ppss (match-beginning 0)))) + (ruby-singleton-class-p (match-beginning 0))) + (put-text-property (match-beginning 7) (match-end 7) + 'syntax-table (string-to-syntax "\"")) + (ruby-syntax-propertize-heredoc end)))) + ;; Handle percent literals: %w(), %q{}, etc. + ((concat "\\(?:^\\|[[ \t\n<+(,=]\\)" ruby-percent-literal-beg-re) + (1 (prog1 "|" (ruby-syntax-propertize-percent-literal end))))) + (point) end))) + +(defun ruby-syntax-propertize-heredoc (limit) + (let ((ppss (syntax-ppss)) + (res '())) + (when (eq ?\n (nth 3 ppss)) + (save-excursion + (goto-char (nth 8 ppss)) (beginning-of-line) - (catch 'found-beg - (while (and (re-search-backward ruby-here-doc-beg-re nil t) - (not (ruby-singleton-class-p))) - (if (not (or (ruby-in-ppss-context-p 'anything) - (ruby-here-doc-find-end old-point))) - (throw 'found-beg t))))))) - - (defun ruby-here-doc-find-end (&optional limit) - "Expects the point to be on a line with one or more heredoc openers. -Returns the buffer position at which all heredocs on the line -are terminated, or nil if they aren't terminated before the -buffer position `limit' or the end of the buffer." - (save-excursion - (beginning-of-line) - (catch 'done - (let ((eol (point-at-eol)) - (case-fold-search nil) - ;; Fake match data such that (match-end 0) is at eol - (end-match-data (progn (looking-at ".*$") (match-data))) - beg-match-data end-re) - (while (re-search-forward ruby-here-doc-beg-re eol t) - (setq beg-match-data (match-data)) - (setq end-re (ruby-here-doc-end-match)) - - (set-match-data end-match-data) - (goto-char (match-end 0)) - (unless (re-search-forward end-re limit t) (throw 'done nil)) - (setq end-match-data (match-data)) - - (set-match-data beg-match-data) - (goto-char (match-end 0))) - (set-match-data end-match-data) - (goto-char (match-end 0)) - (point))))) - - (defun ruby-here-doc-beg-syntax () - "Return the syntax cell for a line that may begin a heredoc. -See the definition of `ruby-font-lock-syntactic-keywords'. - -This sets the syntax cell for the newline ending the line -containing the heredoc beginning so that cases where multiple -heredocs are started on one line are handled correctly." - (save-excursion - (goto-char (match-beginning 0)) - (unless (or (ruby-in-ppss-context-p 'non-heredoc) - (ruby-in-here-doc-p)) - (string-to-syntax "\"")))) - - (defun ruby-here-doc-end-syntax () - "Return the syntax cell for a line that may end a heredoc. -See the definition of `ruby-font-lock-syntactic-keywords'." - (let ((pss (syntax-ppss)) (case-fold-search nil)) - ;; If we aren't in a string, we definitely aren't ending a heredoc, - ;; so we can just give up. - ;; This means we aren't doing a full-document search - ;; every time we enter a character. - (when (ruby-in-ppss-context-p 'heredoc pss) + (while (re-search-forward ruby-here-doc-beg-re + (line-end-position) t) + (unless (ruby-singleton-class-p (match-beginning 0)) + (push (concat (ruby-here-doc-end-match) "\n") res)))) + (save-excursion + ;; With multiple openers on the same line, we don't know in which + ;; part `start' is, so we have to go back to the beginning. + (when (cdr res) + (goto-char (nth 8 ppss)) + (setq res (nreverse res))) + (while (and res (re-search-forward (pop res) limit 'move)) + (if (null res) + (put-text-property (1- (point)) (point) + 'syntax-table (string-to-syntax "\"")))) + ;; End up at bol following the heredoc openers. + ;; Propertize expression expansions from this point forward. + )))) + +(defun ruby-syntax-enclosing-percent-literal (limit) + (let ((state (syntax-ppss)) + (start (point))) + ;; When already inside percent literal, re-propertize it. + (when (eq t (nth 3 state)) + (goto-char (nth 8 state)) + (when (looking-at ruby-percent-literal-beg-re) + (ruby-syntax-propertize-percent-literal limit)) + (when (< (point) start) (goto-char start))))) + +(defun ruby-syntax-propertize-percent-literal (limit) + (goto-char (match-beginning 2)) + ;; Not inside a simple string or comment. + (when (eq t (nth 3 (syntax-ppss))) + (let* ((op (char-after)) + (ops (char-to-string op)) + (cl (or (cdr (aref (syntax-table) op)) + (cdr (assoc op '((?< . ?>)))))) + parse-sexp-lookup-properties) + (save-excursion + (condition-case nil + (progn + (if cl ; Paired delimiters. + ;; Delimiter pairs of the same kind can be nested + ;; inside the literal, as long as they are balanced. + ;; Create syntax table that ignores other characters. + (with-syntax-table (make-char-table 'syntax-table nil) + (modify-syntax-entry op (concat "(" (char-to-string cl))) + (modify-syntax-entry cl (concat ")" ops)) + (modify-syntax-entry ?\\ "\\") + (save-restriction + (narrow-to-region (point) limit) + (forward-list))) ; skip to the paired character + ;; Single character delimiter. + (re-search-forward (concat "[^\\]\\(?:\\\\\\\\\\)*" + (regexp-quote ops)) limit nil)) + ;; Found the closing delimiter. + (put-text-property (1- (point)) (point) 'syntax-table + (string-to-syntax "|"))) + ;; Unclosed literal, do nothing. + ((scan-error search-failed))))))) + +(defun ruby-syntax-propertize-expansion () + ;; Save the match data to a text property, for font-locking later. + ;; Set the syntax of all double quotes and backticks to punctuation. + (let* ((beg (match-beginning 2)) + (end (match-end 2)) + (state (and beg (save-excursion (syntax-ppss beg))))) + (when (ruby-syntax-expansion-allowed-p state) + (put-text-property beg (1+ beg) 'ruby-expansion-match-data + (match-data)) + (goto-char beg) + (while (re-search-forward "[\"`]" end 'move) + (put-text-property (match-beginning 0) (match-end 0) + 'syntax-table (string-to-syntax ".")))))) + +(defun ruby-syntax-expansion-allowed-p (parse-state) + "Return non-nil if expression expansion is allowed." + (let ((term (nth 3 parse-state))) + (cond + ((memq term '(?\" ?` ?\n ?/))) + ((eq term t) + (save-match-data (save-excursion - (goto-char (nth 8 pss)) ; Go to the beginning of heredoc. - (let ((eol (point))) - (beginning-of-line) - (if (and (re-search-forward (ruby-here-doc-beg-match) eol t) ; If there is a heredoc that matches this line... - (not (ruby-in-ppss-context-p 'anything)) ; And that's not inside a heredoc/string/comment... - (progn (goto-char (match-end 0)) ; And it's the last heredoc on its line... - (not (re-search-forward ruby-here-doc-beg-re eol t)))) - (string-to-syntax "\""))))))) + (goto-char (nth 8 parse-state)) + (looking-at "%\\(?:[QWrxI]\\|\\W\\)"))))))) - (unless (functionp 'syntax-ppss) - (defun syntax-ppss (&optional pos) - (parse-partial-sexp (point-min) (or pos (point))))) - ) +(defun ruby-syntax-propertize-expansions (start end) + (save-excursion + (goto-char start) + (while (re-search-forward ruby-expression-expansion-re end 'move) + (ruby-syntax-propertize-expansion)))) (defun ruby-in-ppss-context-p (context &optional ppss) (let ((ppss (or ppss (syntax-ppss (point))))) @@ -1880,14 +1713,6 @@ "context name `" (symbol-name context) "' is unknown")))) t))) -(if (featurep 'xemacs) - (put 'ruby-mode 'font-lock-defaults - '((ruby-font-lock-keywords) - nil nil nil - beginning-of-line - (font-lock-syntactic-keywords - . ruby-font-lock-syntactic-keywords)))) - (defvar ruby-font-lock-syntax-table (let ((tbl (copy-syntax-table ruby-mode-syntax-table))) (modify-syntax-entry ?_ "w" tbl) @@ -2082,9 +1907,7 @@ (setq-local font-lock-keywords ruby-font-lock-keywords) (setq-local font-lock-syntax-table ruby-font-lock-syntax-table) - (if (eval-when-compile (fboundp 'syntax-propertize-rules)) - (setq-local syntax-propertize-function #'ruby-syntax-propertize-function) - (setq-local font-lock-syntactic-keywords ruby-font-lock-syntactic-keywords))) + (setq-local syntax-propertize-function #'ruby-syntax-propertize-function)) ;;; Invoke ruby-mode when appropriate ------------------------------------------------------------ revno: 114898 author: Bozhidar Batsov committer: Dmitry Gutov branch nick: trunk timestamp: Sat 2013-11-02 04:17:54 +0400 message: * lisp/progmodes/ruby-mode.el (ruby-mode-variables, ruby-mode): Use `setq-local'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 23:55:15 +0000 +++ lisp/ChangeLog 2013-11-02 00:17:54 +0000 @@ -1,3 +1,7 @@ +2013-11-02 Bozhidar Batsov + + * progmodes/ruby-mode.el (ruby-mode-variables, ruby-mode): Use `setq-local'. + 2013-11-01 Bozhidar Batsov * progmodes/ruby-mode.el (ruby-mode-variables): Don't set syntax === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-01 23:55:15 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-02 00:17:54 +0000 @@ -565,17 +565,17 @@ (smie-setup ruby-smie-grammar #'ruby-smie-rules :forward-token #'ruby-smie--forward-token :backward-token #'ruby-smie--backward-token) - (set (make-local-variable 'indent-line-function) 'ruby-indent-line)) - (set (make-local-variable 'require-final-newline) t) - (set (make-local-variable 'comment-start) "# ") - (set (make-local-variable 'comment-end) "") - (set (make-local-variable 'comment-column) ruby-comment-column) - (set (make-local-variable 'comment-start-skip) "#+ *") - (set (make-local-variable 'parse-sexp-ignore-comments) t) - (set (make-local-variable 'parse-sexp-lookup-properties) t) - (set (make-local-variable 'paragraph-start) (concat "$\\|" page-delimiter)) - (set (make-local-variable 'paragraph-separate) paragraph-start) - (set (make-local-variable 'paragraph-ignore-fill-prefix) t)) + (setq-local indent-line-function 'ruby-indent-line)) + (setq-local require-final-newline t) + (setq-local comment-start "# ") + (setq-local comment-end "") + (setq-local comment-column ruby-comment-column) + (setq-local comment-start-skip "#+ *") + (setq-local parse-sexp-ignore-comments t) + (setq-local parse-sexp-lookup-properties t) + (setq-local paragraph-start (concat "$\\|" page-delimiter)) + (setq-local paragraph-separate paragraph-start) + (setq-local paragraph-ignore-fill-prefix t)) (defun ruby-mode-set-encoding () "Insert a magic comment header with the proper encoding if necessary." @@ -2069,32 +2069,22 @@ \\{ruby-mode-map}" (ruby-mode-variables) - (set (make-local-variable 'imenu-create-index-function) - 'ruby-imenu-create-index) - (set (make-local-variable 'add-log-current-defun-function) - 'ruby-add-log-current-method) - (set (make-local-variable 'beginning-of-defun-function) - 'ruby-beginning-of-defun) - (set (make-local-variable 'end-of-defun-function) - 'ruby-end-of-defun) + (setq-local imenu-create-index-function 'ruby-imenu-create-index) + (setq-local add-log-current-defun-function 'ruby-add-log-current-method) + (setq-local beginning-of-defun-function 'ruby-beginning-of-defun) + (setq-local end-of-defun-function 'ruby-end-of-defun) (add-hook 'after-save-hook 'ruby-mode-set-encoding nil 'local) - (set (make-local-variable 'electric-indent-chars) - (append '(?\{ ?\}) electric-indent-chars)) + (setq-local electric-indent-chars (append '(?\{ ?\}) electric-indent-chars)) - (set (make-local-variable 'font-lock-defaults) - '((ruby-font-lock-keywords) nil nil)) - (set (make-local-variable 'font-lock-keywords) - ruby-font-lock-keywords) - (set (make-local-variable 'font-lock-syntax-table) - ruby-font-lock-syntax-table) + (setq-local font-lock-defaults '((ruby-font-lock-keywords) nil nil)) + (setq-local font-lock-keywords ruby-font-lock-keywords) + (setq-local font-lock-syntax-table ruby-font-lock-syntax-table) (if (eval-when-compile (fboundp 'syntax-propertize-rules)) - (set (make-local-variable 'syntax-propertize-function) - #'ruby-syntax-propertize-function) - (set (make-local-variable 'font-lock-syntactic-keywords) - ruby-font-lock-syntactic-keywords))) + (setq-local syntax-propertize-function #'ruby-syntax-propertize-function) + (setq-local font-lock-syntactic-keywords ruby-font-lock-syntactic-keywords))) ;;; Invoke ruby-mode when appropriate ------------------------------------------------------------ revno: 114897 author: Bozhidar Batsov committer: Dmitry Gutov branch nick: trunk timestamp: Sat 2013-11-02 03:55:15 +0400 message: * lisp/progmodes/ruby-mode.el (ruby-mode-variables): Don't set syntax table and abbrev table, `define-derived-mode' does that for us anyway. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 17:26:29 +0000 +++ lisp/ChangeLog 2013-11-01 23:55:15 +0000 @@ -1,3 +1,9 @@ +2013-11-01 Bozhidar Batsov + + * progmodes/ruby-mode.el (ruby-mode-variables): Don't set syntax + table and abbrev table, `define-derived-mode' does that for us + anyway. + 2013-11-01 Glenn Morris * Makefile.in: Remove manual mh-e dependencies (writing .elc === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-11-01 03:35:35 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-01 23:55:15 +0000 @@ -141,9 +141,6 @@ (defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]") "Regexp to match symbols.") -(define-abbrev-table 'ruby-mode-abbrev-table () - "Abbrev table in use in Ruby mode buffers.") - (defvar ruby-use-smie t) (defvar ruby-mode-map @@ -563,8 +560,6 @@ (defun ruby-mode-variables () "Set up initial buffer-local variables for Ruby mode." - (set-syntax-table ruby-mode-syntax-table) - (setq local-abbrev-table ruby-mode-abbrev-table) (setq indent-tabs-mode ruby-indent-tabs-mode) (if ruby-use-smie (smie-setup ruby-smie-grammar #'ruby-smie-rules ------------------------------------------------------------ revno: 114896 committer: Glenn Morris branch nick: trunk timestamp: Fri 2013-11-01 13:26:29 -0400 message: * lisp/Makefile.in: Remove manual mh-e dependencies (writing .elc files is atomic for some time, so no parallel compilation issues) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 15:47:10 +0000 +++ lisp/ChangeLog 2013-11-01 17:26:29 +0000 @@ -1,3 +1,8 @@ +2013-11-01 Glenn Morris + + * Makefile.in: Remove manual mh-e dependencies (writing .elc + files is atomic for some time, so no parallel compilation issues). + 2013-11-01 Jan Djärv * faces.el (face-x-resources): Add :distant-foreground. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2013-10-31 07:27:35 +0000 +++ lisp/Makefile.in 2013-11-01 17:26:29 +0000 @@ -452,6 +452,13 @@ # Dependencies +## None of the following matters for bootstrap, which is the only way +## to ensure a correct compilation of all lisp files. +## Manually specifying dependencies of a handful of lisp files, (and +## ones that don't change very often at that) seems pretty pointless +## to me. + +# http://debbugs.gnu.org/1004 # CC Mode uses a compile time macro system which causes a compile time # dependency in cc-*.elc files on the macros in other cc-*.el and the # version string in cc-defs.el. @@ -496,59 +503,4 @@ $(lisp)/progmodes/cc-vars.elc: $(lisp)/custom.elc $(lisp)/widget.elc -# MH-E dependencies, mainly to prevent failures with parallel -# compilation, due to race conditions between writing a given FOO.elc -# file and another file being compiled that says "(require FOO)", -# which causes Emacs to try to read FOO.elc. -$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-comp.elc $(MH_E_DIR)/mh-folder.elc\ - $(MH_E_DIR)/mh-funcs.elc $(MH_E_DIR)/mh-identity.elc $(MH_E_DIR)/mh-inc.elc\ - $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-limit.elc\ - $(MH_E_DIR)/mh-mime.elc $(MH_E_DIR)/mh-print.elc $(MH_E_DIR)/mh-scan.elc\ - $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc\ - $(MH_E_DIR)/mh-speed.elc $(MH_E_DIR)/mh-thread.elc $(MH_E_DIR)/mh-tool-bar.elc\ - $(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc:\ - $(MH_E_DIR)/mh-e.elc - -$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-e.elc $(MH_E_DIR)/mh-folder.elc\ - $(MH_E_DIR)/mh-inc.elc $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-limit.elc\ - $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-speed.elc\ - $(MH_E_DIR)/mh-utils.elc $(MH_E_DIR)/mh-xface.elc:\ - $(lisp)/emacs-lisp/cl.elc - -$(MH_E_DIR)/mh-comp.elc $(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-funcs.elc\ - $(MH_E_DIR)/mh-junk.elc $(MH_E_DIR)/mh-limit.elc $(MH_E_DIR)/mh-print.elc\ - $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-thread.elc:\ - $(MH_E_DIR)/mh-scan.elc - -$(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-mime.elc\ - $(MH_E_DIR)/mh-search.elc $(MH_E_DIR)/mh-show.elc $(MH_E_DIR)/mh-speed.elc:\ - $(lisp)/gnus/gnus-util.elc - -$(MH_E_DIR)/mh-folder.elc $(MH_E_DIR)/mh-search.elc:\ - $(lisp)/progmodes/which-func.elc - -$(MH_E_DIR)/mh-letter.elc $(MH_E_DIR)/mh-seq.elc $(MH_E_DIR)/mh-show.elc\ - $(MH_E_DIR)/mh-utils.elc:\ - $(lisp)/font-lock.elc - -$(MH_E_DIR)/mh-alias.elc $(MH_E_DIR)/mh-show.elc: $(lisp)/net/goto-addr.elc - -$(MH_E_DIR)/mh-comp.elc: $(lisp)/mail/sendmail.elc - -$(MH_E_DIR)/mh-e.elc: $(MH_E_DIR)/mh-buffers.elc $(lisp)/gnus/gnus.elc \ - $(lisp)/cus-face.elc - -$(MH_E_DIR)/mh-letter.elc: $(lisp)/gnus/mailcap.elc $(lisp)/gnus/mm-decode.elc \ - $(lisp)/gnus/mm-view.elc $(lisp)/gnus/mml.elc $(lisp)/gnus/message.elc - -$(MH_E_DIR)/mh-print.elc: $(lisp)/ps-print.elc - -$(MH_E_DIR)/mh-search.elc: $(lisp)/imenu.elc - -$(MH_E_DIR)/mh-show.elc: $(lisp)/gnus/gnus-cite.elc - -$(MH_E_DIR)/mh-speed.elc: $(lisp)/speedbar.elc $(lisp)/emacs-lisp/timer.elc - -$(MH_E_DIR)/mh-tool-bar.elc: $(lisp)/tool-bar.elc - # Makefile ends here. ------------------------------------------------------------ revno: 114895 committer: Jan D. branch nick: trunk timestamp: Fri 2013-11-01 16:47:10 +0100 message: Add :distant-foreground to faces. * doc/lispref/display.texi (Face Attributes): Document :distant-foreground. * etc/NEWS: Mention :distant-foreground. * lisp/faces.el (face-x-resources): Add :distant-foreground. (region): Use :distant-foreground for gtk and ns. * src/dispextern.h (lface_attribute_index): Add LFACE_DISTANT_FOREGROUND_INDEX. * src/xfaces.c: Declare color_distance. (QCdistant_foreground): New variable. (NEAR_SAME_COLOR_THRESHOLD): New define. (load_color2): New function. (load_color): Call load_color2. (load_face_colors): Call load_color2 and if distant-color is specified calculate distant and use distant-color if colors are near. (LFACE_DISTANT_FOREGROUND): New define. (merge_face_ref, Finternal_set_lisp_face_attribute) (Finternal_get_lisp_face_attribute) (x_supports_face_attributes_p): Handle distant-foreground similar to foreground. (syms_of_xfaces): DEFSYM QCdistant_foreground. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-10-30 10:08:11 +0000 +++ doc/lispref/ChangeLog 2013-11-01 15:47:10 +0000 @@ -1,3 +1,7 @@ +2013-11-01 Jan Djärv + + * display.texi (Face Attributes): Document :distant-foreground. + 2013-10-30 Xue Fuqiao * display.texi (Abstract Display): Improve indexing. === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2013-10-30 10:08:11 +0000 +++ doc/lispref/display.texi 2013-11-01 15:47:10 +0000 @@ -2036,6 +2036,15 @@ black-and-white displays, certain shades of gray are implemented by stipple patterns. +@item :distant-foreground +Alternative foreground color, a string. This is like @code{:foreground} +but the color is only used as a foreground when the background color is +near to the foreground that would have been used. This is useful for +example when marking text (i.e. the region face). If the text has a foreground +that is visible with the region face, that foreground is used. +If the foreground is near the region face background, +@code{:distant-foreground} is used instead so the text is readable. + @item :background Background color, a string. The value can be a system-defined color name, or a hexadecimal color specification. @xref{Color Names}. === modified file 'etc/ChangeLog' --- etc/ChangeLog 2013-10-16 00:17:38 +0000 +++ etc/ChangeLog 2013-11-01 15:47:10 +0000 @@ -1,3 +1,7 @@ +2013-11-01 Jan Djärv + + * NEWS: Mention :distant-foreground. + 2013-10-16 Dmitry Gutov * NEWS: Mention the homepage-related changes in package.el. === modified file 'etc/NEWS' --- etc/NEWS 2013-10-29 16:11:50 +0000 +++ etc/NEWS 2013-11-01 15:47:10 +0000 @@ -788,6 +788,10 @@ *** New face characteristic (supports :underline (:style wave)) specifies whether or not the terminal can display a wavy line. +*** New face spec attribute :distant-foreground +specifies foreground to use if background is near the foreground that would +otherwise have been used. + ** Image API +++ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 10:27:21 +0000 +++ lisp/ChangeLog 2013-11-01 15:47:10 +0000 @@ -1,3 +1,8 @@ +2013-11-01 Jan Djärv + + * faces.el (face-x-resources): Add :distant-foreground. + (region): Use :distant-foreground for gtk and ns. + 2013-11-01 Tassilo Horn Allow multiple bibliographies when BibLaTeX is used rathen than === modified file 'lisp/faces.el' --- lisp/faces.el 2013-10-08 17:49:20 +0000 +++ lisp/faces.el 2013-11-01 15:47:10 +0000 @@ -274,6 +274,8 @@ (:weight (".attributeWeight" . "Face.AttributeWeight")) (:slant (".attributeSlant" . "Face.AttributeSlant")) (:foreground (".attributeForeground" . "Face.AttributeForeground")) + (:distant-foreground + (".attributeDistantForeground" . "Face.AttributeDistantForeground")) (:background (".attributeBackground" . "Face.AttributeBackground")) (:overline (".attributeOverline" . "Face.AttributeOverline")) (:strike-through (".attributeStrikeThrough" . "Face.AttributeStrikeThrough")) @@ -2255,10 +2257,10 @@ '((((class color) (min-colors 88) (background dark)) :background "blue3") (((class color) (min-colors 88) (background light) (type gtk)) - :foreground "gtk_selection_fg_color" + :distant-foreground "gtk_selection_fg_color" :background "gtk_selection_bg_color") (((class color) (min-colors 88) (background light) (type ns)) - :foreground "ns_selection_fg_color" + :distant-foreground "ns_selection_fg_color" :background "ns_selection_bg_color") (((class color) (min-colors 88) (background light)) :background "lightgoldenrod2") === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-01 09:18:39 +0000 +++ src/ChangeLog 2013-11-01 15:47:10 +0000 @@ -1,3 +1,22 @@ +2013-11-01 Jan Djärv + + * xfaces.c: Declare color_distance. + (QCdistant_foreground): New variable. + (NEAR_SAME_COLOR_THRESHOLD): New define. + (load_color2): New function. + (load_color): Call load_color2. + (load_face_colors): Call load_color2 and if distant-color is specified + calculate distant and use distant-color if colors are near. + (LFACE_DISTANT_FOREGROUND): New define. + (merge_face_ref, Finternal_set_lisp_face_attribute) + (Finternal_get_lisp_face_attribute) + (x_supports_face_attributes_p): Handle distant-foreground similar to + foreground. + (syms_of_xfaces): DEFSYM QCdistant_foreground. + + * dispextern.h (lface_attribute_index): Add + LFACE_DISTANT_FOREGROUND_INDEX. + 2013-11-01 Claudio Bley * image.c (pbm_next_char): New function. See === modified file 'src/dispextern.h' --- src/dispextern.h 2013-10-29 16:11:50 +0000 +++ src/dispextern.h 2013-11-01 15:47:10 +0000 @@ -1543,6 +1543,7 @@ LFACE_FONT_INDEX, LFACE_INHERIT_INDEX, LFACE_FONTSET_INDEX, + LFACE_DISTANT_FOREGROUND_INDEX, LFACE_VECTOR_SIZE }; === modified file 'src/xfaces.c' --- src/xfaces.c 2013-10-29 16:11:50 +0000 +++ src/xfaces.c 2013-11-01 15:47:10 +0000 @@ -292,7 +292,7 @@ static Lisp_Object QCfont, QCbold, QCitalic; static Lisp_Object QCreverse_video; static Lisp_Object QCoverline, QCstrike_through, QCbox, QCinherit; -static Lisp_Object QCfontset; +static Lisp_Object QCfontset, QCdistant_foreground; /* Symbols used for attribute values. */ @@ -440,6 +440,7 @@ static void free_face_cache (struct face_cache *); static int merge_face_ref (struct frame *, Lisp_Object, Lisp_Object *, int, struct named_merge_point *); +static int color_distance (XColor *x, XColor *y); #ifdef HAVE_WINDOW_SYSTEM static void set_font_frame_param (Lisp_Object, Lisp_Object); @@ -910,6 +911,8 @@ X Colors ***********************************************************************/ +#define NEAR_SAME_COLOR_THRESHOLD 30000 + /* Parse RGB_LIST, and fill in the RGB fields of COLOR. RGB_LIST should contain (at least) 3 lisp integers. Return 0 if there's a problem with RGB_LIST, otherwise return 1. */ @@ -1176,24 +1179,10 @@ } -/* Load color with name NAME for use by face FACE on frame F. - TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, - LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, - LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the - pixel color. If color cannot be loaded, display a message, and - return the foreground, background or underline color of F, but - record that fact in flags of the face so that we don't try to free - these colors. */ - -#ifndef MSDOS -static -#endif -unsigned long -load_color (struct frame *f, struct face *face, Lisp_Object name, - enum lface_attribute_index target_index) +static unsigned long +load_color2 (struct frame *f, struct face *face, Lisp_Object name, + enum lface_attribute_index target_index, XColor *color) { - XColor color; - eassert (STRINGP (name)); eassert (target_index == LFACE_FOREGROUND_INDEX || target_index == LFACE_BACKGROUND_INDEX @@ -1204,7 +1193,7 @@ /* if the color map is full, defined_color will return a best match to the values in an existing cell. */ - if (!defined_color (f, SSDATA (name), &color, 1)) + if (!defined_color (f, SSDATA (name), color, 1)) { add_to_log ("Unable to load color \"%s\"", name, Qnil); @@ -1212,32 +1201,32 @@ { case LFACE_FOREGROUND_INDEX: face->foreground_defaulted_p = 1; - color.pixel = FRAME_FOREGROUND_PIXEL (f); + color->pixel = FRAME_FOREGROUND_PIXEL (f); break; case LFACE_BACKGROUND_INDEX: face->background_defaulted_p = 1; - color.pixel = FRAME_BACKGROUND_PIXEL (f); + color->pixel = FRAME_BACKGROUND_PIXEL (f); break; case LFACE_UNDERLINE_INDEX: face->underline_defaulted_p = 1; - color.pixel = FRAME_FOREGROUND_PIXEL (f); + color->pixel = FRAME_FOREGROUND_PIXEL (f); break; case LFACE_OVERLINE_INDEX: face->overline_color_defaulted_p = 1; - color.pixel = FRAME_FOREGROUND_PIXEL (f); + color->pixel = FRAME_FOREGROUND_PIXEL (f); break; case LFACE_STRIKE_THROUGH_INDEX: face->strike_through_color_defaulted_p = 1; - color.pixel = FRAME_FOREGROUND_PIXEL (f); + color->pixel = FRAME_FOREGROUND_PIXEL (f); break; case LFACE_BOX_INDEX: face->box_color_defaulted_p = 1; - color.pixel = FRAME_FOREGROUND_PIXEL (f); + color->pixel = FRAME_FOREGROUND_PIXEL (f); break; default: @@ -1249,7 +1238,27 @@ ++ncolors_allocated; #endif - return color.pixel; + return color->pixel; +} + +/* Load color with name NAME for use by face FACE on frame F. + TARGET_INDEX must be one of LFACE_FOREGROUND_INDEX, + LFACE_BACKGROUND_INDEX, LFACE_UNDERLINE_INDEX, LFACE_OVERLINE_INDEX, + LFACE_STRIKE_THROUGH_INDEX, or LFACE_BOX_INDEX. Value is the + pixel color. If color cannot be loaded, display a message, and + return the foreground, background or underline color of F, but + record that fact in flags of the face so that we don't try to free + these colors. */ + +#ifndef MSDOS +static +#endif +unsigned long +load_color (struct frame *f, struct face *face, Lisp_Object name, + enum lface_attribute_index target_index) +{ + XColor color; + return load_color2 (f, face, name, target_index, &color); } @@ -1264,7 +1273,8 @@ load_face_colors (struct frame *f, struct face *face, Lisp_Object attrs[LFACE_VECTOR_SIZE]) { - Lisp_Object fg, bg; + Lisp_Object fg, bg, dfg; + XColor xfg, xbg; bg = attrs[LFACE_BACKGROUND_INDEX]; fg = attrs[LFACE_FOREGROUND_INDEX]; @@ -1289,8 +1299,18 @@ face->stipple = load_pixmap (f, Vface_default_stipple); } - face->background = load_color (f, face, bg, LFACE_BACKGROUND_INDEX); - face->foreground = load_color (f, face, fg, LFACE_FOREGROUND_INDEX); + face->background = load_color2 (f, face, bg, LFACE_BACKGROUND_INDEX, &xbg); + face->foreground = load_color2 (f, face, fg, LFACE_FOREGROUND_INDEX, &xfg); + + dfg = attrs[LFACE_DISTANT_FOREGROUND_INDEX]; + if (!NILP (dfg) && !UNSPECIFIEDP (dfg) + && color_distance (&xbg, &xfg) < NEAR_SAME_COLOR_THRESHOLD) + { + if (EQ (attrs[LFACE_INVERSE_INDEX], Qt)) + face->background = load_color (f, face, dfg, LFACE_BACKGROUND_INDEX); + else + face->foreground = load_color (f, face, dfg, LFACE_FOREGROUND_INDEX); + } } #ifdef HAVE_X_WINDOWS @@ -1721,6 +1741,8 @@ #define LFACE_FONT(LFACE) AREF ((LFACE), LFACE_FONT_INDEX) #define LFACE_INHERIT(LFACE) AREF ((LFACE), LFACE_INHERIT_INDEX) #define LFACE_FONTSET(LFACE) AREF ((LFACE), LFACE_FONTSET_INDEX) +#define LFACE_DISTANT_FOREGROUND(LFACE) \ + AREF ((LFACE), LFACE_DISTANT_FOREGROUND_INDEX) /* Non-zero if LFACE is a Lisp face. A Lisp face is a vector of size LFACE_VECTOR_SIZE which has the symbol `face' in slot 0. */ @@ -2449,6 +2471,13 @@ else err = 1; } + else if (EQ (keyword, QCdistant_foreground)) + { + if (STRINGP (value)) + to[LFACE_DISTANT_FOREGROUND_INDEX] = value; + else + err = 1; + } else if (EQ (keyword, QCbackground)) { if (STRINGP (value)) @@ -3005,6 +3034,23 @@ old_value = LFACE_FOREGROUND (lface); ASET (lface, LFACE_FOREGROUND_INDEX, value); } + else if (EQ (attr, QCdistant_foreground)) + { + /* Compatibility with 20.x. */ + if (NILP (value)) + value = Qunspecified; + if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)) + { + /* Don't check for valid color names here because it depends + on the frame (display) whether the color will be valid + when the face is realized. */ + CHECK_STRING (value); + if (SCHARS (value) == 0) + signal_error ("Empty distant-foreground color value", value); + } + old_value = LFACE_DISTANT_FOREGROUND (lface); + ASET (lface, LFACE_DISTANT_FOREGROUND_INDEX, value); + } else if (EQ (attr, QCbackground)) { /* Compatibility with 20.x. */ @@ -3649,6 +3695,8 @@ value = LFACE_INVERSE (lface); else if (EQ (keyword, QCforeground)) value = LFACE_FOREGROUND (lface); + else if (EQ (keyword, QCdistant_foreground)) + value = LFACE_DISTANT_FOREGROUND (lface); else if (EQ (keyword, QCbackground)) value = LFACE_BACKGROUND (lface); else if (EQ (keyword, QCstipple)) @@ -4688,6 +4736,9 @@ || (!UNSPECIFIEDP (attrs[LFACE_FOREGROUND_INDEX]) && face_attr_equal_p (attrs[LFACE_FOREGROUND_INDEX], def_attrs[LFACE_FOREGROUND_INDEX])) + || (!UNSPECIFIEDP (attrs[LFACE_DISTANT_FOREGROUND_INDEX]) + && face_attr_equal_p (attrs[LFACE_DISTANT_FOREGROUND_INDEX], + def_attrs[LFACE_DISTANT_FOREGROUND_INDEX])) || (!UNSPECIFIEDP (attrs[LFACE_BACKGROUND_INDEX]) && face_attr_equal_p (attrs[LFACE_BACKGROUND_INDEX], def_attrs[LFACE_BACKGROUND_INDEX])) @@ -6361,6 +6412,7 @@ DEFSYM (QCwidth, ":width"); DEFSYM (QCfont, ":font"); DEFSYM (QCfontset, ":fontset"); + DEFSYM (QCdistant_foreground, ":distant-foreground"); DEFSYM (QCbold, ":bold"); DEFSYM (QCitalic, ":italic"); DEFSYM (QCoverline, ":overline"); ------------------------------------------------------------ revno: 114894 committer: Tassilo Horn branch nick: trunk timestamp: Fri 2013-11-01 11:27:21 +0100 message: Allow multiple bibliographies when BibLaTeX is used rathen than BibTeX. * textmodes/reftex-parse.el (reftex-using-biblatex-p): New function. (reftex-locate-bibliography-files): Us it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 09:10:13 +0000 +++ lisp/ChangeLog 2013-11-01 10:27:21 +0000 @@ -1,3 +1,10 @@ +2013-11-01 Tassilo Horn + + Allow multiple bibliographies when BibLaTeX is used rathen than + BibTeX. + * textmodes/reftex-parse.el (reftex-using-biblatex-p): New function. + (reftex-locate-bibliography-files): Us it. + 2013-11-01 Claudio Bley * image.el (image-type-header-regexps): Fix the 'pbm' part to === modified file 'lisp/textmodes/reftex-parse.el' --- lisp/textmodes/reftex-parse.el 2013-06-12 12:42:35 +0000 +++ lisp/textmodes/reftex-parse.el 2013-11-01 10:27:21 +0000 @@ -350,20 +350,38 @@ ;; Return the list docstruct)) +(defun reftex-using-biblatex-p () + "Return non-nil iff we are using biblatex rather than bibtex." + (if (boundp 'TeX-active-styles) + ;; the sophisticated AUCTeX way + (member "biblatex" TeX-active-styles) + ;; poor-man's check... + (save-excursion + (re-search-forward "^[^%]*\\\\usepackage.*{biblatex}" nil t)))) + (defun reftex-locate-bibliography-files (master-dir &optional files) - "Scan buffer for bibliography macro and return file list." + "Scan buffer for bibliography macros and return file list." (unless files (save-excursion (goto-char (point-min)) - (if (re-search-forward - (concat -; "\\(\\`\\|[\n\r]\\)[^%]*\\\\\\(" - "\\(^\\)[^%\n\r]*\\\\\\(" - (mapconcat 'identity reftex-bibliography-commands "\\|") - "\\)\\(\\[.+?\\]\\)?{[ \t]*\\([^}]+\\)") nil t) - (setq files - (split-string (reftex-match-string 4) - "[ \t\n\r]*,[ \t\n\r]*"))))) + ;; when biblatex is used, multiple \bibliography or + ;; \addbibresource macros are allowed. With plain bibtex, only + ;; the first is used. + (let ((using-biblatex (reftex-using-biblatex-p)) + (again t)) + (while (and again + (re-search-forward + (concat + ;; "\\(\\`\\|[\n\r]\\)[^%]*\\\\\\(" + "\\(^\\)[^%\n\r]*\\\\\\(" + (mapconcat 'identity reftex-bibliography-commands "\\|") + "\\)\\(\\[.+?\\]\\)?{[ \t]*\\([^}]+\\)") nil t)) + (setq files + (append files + (split-string (reftex-match-string 4) + "[ \t\n\r]*,[ \t\n\r]*"))) + (unless using-biblatex + (setq again nil)))))) (when files (setq files (mapcar ------------------------------------------------------------ revno: 114893 committer: Glenn Morris branch nick: trunk timestamp: Fri 2013-11-01 06:21:34 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2013-10-01 10:17:41 +0000 +++ lisp/ldefs-boot.el 2013-11-01 10:21:34 +0000 @@ -483,6 +483,7 @@ ;;;### (autoloads nil "allout" "allout.el" (20996 49577 892030 0)) ;;; Generated autoloads from allout.el (push (purecopy '(allout 2 3)) package--builtin-versions) + (autoload 'allout-auto-activation-helper "allout" "\ Institute `allout-auto-activation'. @@ -843,6 +844,7 @@ ;;;;;; 49577 892030 0)) ;;; Generated autoloads from allout-widgets.el (push (purecopy '(allout-widgets 1 0)) package--builtin-versions) + (let ((loads (get 'allout-widgets 'custom-loads))) (if (member '"allout-widgets" loads) nil (put 'allout-widgets 'custom-loads (cons '"allout-widgets" loads)))) (autoload 'allout-widgets-setup "allout-widgets" "\ @@ -954,10 +956,11 @@ ;;;*** -;;;### (autoloads nil "ansi-color" "ansi-color.el" (20975 43430 521692 +;;;### (autoloads nil "ansi-color" "ansi-color.el" (21086 26537 509049 ;;;;;; 0)) ;;; Generated autoloads from ansi-color.el (push (purecopy '(ansi-color 3 4 2)) package--builtin-versions) + (autoload 'ansi-color-for-comint-mode-on "ansi-color" "\ Set `ansi-color-for-comint-mode' to t. @@ -984,6 +987,7 @@ ;;;;;; 34805 522289 827000)) ;;; Generated autoloads from progmodes/antlr-mode.el (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions) + (autoload 'antlr-show-makefile-rules "antlr-mode" "\ Show Makefile rules for all grammar files in the current directory. If the `major-mode' of the current buffer has the value `makefile-mode', @@ -1250,6 +1254,7 @@ ;;;;;; 893295 0)) ;;; Generated autoloads from textmodes/artist.el (push (purecopy '(artist 1 2 6)) package--builtin-versions) + (autoload 'artist-mode "artist" "\ Toggle Artist mode. With argument ARG, turn Artist mode on if ARG is positive. @@ -1603,8 +1608,8 @@ ;;;*** -;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (20974 -;;;;;; 22577 548213 0)) +;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (21105 +;;;;;; 27518 41539 966000)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1801,7 +1806,7 @@ ;;;*** -;;;### (autoloads nil "battery" "battery.el" (20791 9657 561026 0)) +;;;### (autoloads nil "battery" "battery.el" (21096 9821 480125 690000)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -2634,6 +2639,7 @@ ;;;### (autoloads nil "bs" "bs.el" (20992 52525 458637 0)) ;;; Generated autoloads from bs.el (push (purecopy '(bs 1 17)) package--builtin-versions) + (autoload 'bs-cycle-next "bs" "\ Select next buffer defined by buffer cycling. The buffers taking part in buffer cycling are defined @@ -2714,8 +2720,8 @@ ;;;*** -;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21024 -;;;;;; 55496 462544 366000)) +;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21104 +;;;;;; 56491 538513 0)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -3088,8 +3094,8 @@ ;;;*** -;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21063 -;;;;;; 65063 266334 0)) +;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21102 +;;;;;; 14759 136845 0)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3678,8 +3684,8 @@ ;;;*** -;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21032 23080 -;;;;;; 765139 0)) +;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21069 17449 +;;;;;; 167398 0)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3702,12 +3708,14 @@ ;;;;;; 0)) ;;; Generated autoloads from cedet/cedet.el (push (purecopy '(cedet 2 0)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (20958 34345 ;;;;;; 952538 0)) ;;; Generated autoloads from progmodes/cfengine.el (push (purecopy '(cfengine 1 2)) package--builtin-versions) + (autoload 'cfengine3-mode "cfengine" "\ Major mode for editing CFEngine3 input. There are no special keybindings by default. @@ -3738,6 +3746,7 @@ ;;;;;; 391345 0)) ;;; Generated autoloads from emacs-lisp/chart.el (push (purecopy '(chart 0 2)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el" @@ -3761,7 +3770,8 @@ ;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (20996 ;;;;;; 49577 892030 0)) ;;; Generated autoloads from emacs-lisp/checkdoc.el -(push (purecopy '(checkdoc 0 6 2)) package--builtin-versions)(put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp) +(push (purecopy '(checkdoc 0 6 2)) package--builtin-versions) +(put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp) (put 'checkdoc-force-history-flag 'safe-local-variable #'booleanp) (put 'checkdoc-permit-comma-termination-flag 'safe-local-variable #'booleanp) (put 'checkdoc-spellcheck-documentation-flag 'safe-local-variable #'booleanp) @@ -4119,6 +4129,7 @@ ;;;;;; 952905 0)) ;;; Generated autoloads from emacs-lisp/cl-lib.el (push (purecopy '(cl-lib 1 0)) package--builtin-versions) + (define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.3") (defvar cl-custom-print-functions nil "\ @@ -4145,8 +4156,8 @@ ;;;*** -;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (20709 26818 -;;;;;; 907104 0)) +;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21082 29482 +;;;;;; 330637 0)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload 'c-macro-expand "cmacexp" "\ @@ -4206,7 +4217,7 @@ ;;;*** -;;;### (autoloads nil "comint" "comint.el" (21040 17194 398147 0)) +;;;### (autoloads nil "comint" "comint.el" (21104 56491 538513 0)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4339,8 +4350,8 @@ ;;;*** -;;;### (autoloads nil "compile" "progmodes/compile.el" (21002 1963 -;;;;;; 769129 0)) +;;;### (autoloads nil "compile" "progmodes/compile.el" (21096 1265 +;;;;;; 644069 0)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -5049,8 +5060,8 @@ ;;;*** -;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21024 28968 -;;;;;; 738399 0)) +;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21075 56234 +;;;;;; 349623 0)) ;;; Generated autoloads from textmodes/css-mode.el (autoload 'css-mode "css-mode" "\ @@ -5472,6 +5483,7 @@ ;;;;;; 0)) ;;; Generated autoloads from progmodes/cwarn.el (push (purecopy '(cwarn 1 3 1)) package--builtin-versions) + (autoload 'cwarn-mode "cwarn" "\ Minor mode that highlights suspicious C and C++ constructions. @@ -5816,6 +5828,7 @@ ;;;;;; 0)) ;;; Generated autoloads from delim-col.el (push (purecopy '(delim-col 2 1)) package--builtin-versions) + (autoload 'delimit-columns-customize "delim-col" "\ Customization of `columns' group. @@ -5837,7 +5850,7 @@ ;;;*** -;;;### (autoloads nil "delsel" "delsel.el" (20709 26818 907104 0)) +;;;### (autoloads nil "delsel" "delsel.el" (21104 56491 538513 0)) ;;; Generated autoloads from delsel.el (defalias 'pending-delete-mode 'delete-selection-mode) @@ -5968,7 +5981,7 @@ ;;;*** -;;;### (autoloads nil "desktop" "desktop.el" (21005 64551 555603 +;;;### (autoloads nil "desktop" "desktop.el" (21082 29482 330637 ;;;;;; 0)) ;;; Generated autoloads from desktop.el @@ -6327,7 +6340,7 @@ ;;;*** -;;;### (autoloads nil "dired" "dired.el" (21044 14392 310114 433000)) +;;;### (autoloads nil "dired" "dired.el" (21105 26139 752484 0)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6759,6 +6772,7 @@ ;;;;;; 0)) ;;; Generated autoloads from play/dunnet.el (push (purecopy '(dunnet 2 1)) package--builtin-versions) + (autoload 'dunnet "dunnet" "\ Switch to *dungeon* buffer and start game. @@ -6906,8 +6920,8 @@ ;;;*** -;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads nil "easymenu" "emacs-lisp/easymenu.el" (21074 +;;;;;; 35375 473679 0)) ;;; Generated autoloads from emacs-lisp/easymenu.el (autoload 'easy-menu-define "easymenu" "\ @@ -7045,10 +7059,11 @@ ;;;*** -;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (20709 26818 -;;;;;; 907104 0)) +;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21093 51745 +;;;;;; 752738 587000)) ;;; Generated autoloads from progmodes/ebnf2ps.el (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions) + (autoload 'ebnf-customize "ebnf2ps" "\ Customization for ebnf group. @@ -7518,6 +7533,7 @@ ;;;### (autoloads nil "ede" "cedet/ede.el" (20908 27948 216644 0)) ;;; Generated autoloads from cedet/ede.el (push (purecopy '(ede 1 2)) package--builtin-versions) + (defvar global-ede-mode nil "\ Non-nil if Global-Ede mode is enabled. See the command `global-ede-mode' for a description of this minor mode. @@ -7544,12 +7560,14 @@ ;;;;;; 907104 0)) ;;; Generated autoloads from cedet/ede/dired.el (push (purecopy '(dired 0 4)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "ede/project-am" "cedet/ede/project-am.el" ;;;;;; (20881 10343 547564 552000)) ;;; Generated autoloads from cedet/ede/project-am.el (push (purecopy '(project-am 0 0 3)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (20996 49577 @@ -7620,6 +7638,7 @@ ;;;### (autoloads nil "ediff" "vc/ediff.el" (21041 38058 75002 0)) ;;; Generated autoloads from vc/ediff.el (push (purecopy '(ediff 2 81 4)) package--builtin-versions) + (autoload 'ediff-files "ediff" "\ Run Ediff on a pair of files, FILE-A and FILE-B. @@ -7936,6 +7955,7 @@ ;;;;;; 446000)) ;;; Generated autoloads from edmacro.el (push (purecopy '(edmacro 2 1)) package--builtin-versions) + (autoload 'edit-kbd-macro "edmacro" "\ Edit a keyboard macro. At the prompt, type any key sequence which is bound to a keyboard macro. @@ -8039,12 +8059,14 @@ ;;;;;; 730130 282000)) ;;; Generated autoloads from emacs-lisp/eieio.el (push (purecopy '(eieio 1 4)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (20908 ;;;;;; 27948 216644 0)) ;;; Generated autoloads from emacs-lisp/eieio-core.el (push (purecopy '(eieio-core 1 4)) package--builtin-versions) + (autoload 'eieio-defclass-autoload "eieio-core" "\ Create autoload symbols for the EIEIO class CNAME. SUPERCLASSES are the superclasses that CNAME inherits from. @@ -8159,7 +8181,7 @@ ;;;*** -;;;### (autoloads nil "electric" "electric.el" (21056 5418 85093 +;;;### (autoloads nil "electric" "electric.el" (21075 56234 349623 ;;;;;; 0)) ;;; Generated autoloads from electric.el @@ -8658,7 +8680,7 @@ ;;;*** -;;;### (autoloads nil "epa-file" "epa-file.el" (20709 26818 907104 +;;;### (autoloads nil "epa-file" "epa-file.el" (21102 14759 136845 ;;;;;; 0)) ;;; Generated autoloads from epa-file.el @@ -8757,9 +8779,10 @@ ;;;*** -;;;### (autoloads nil "epg" "epg.el" (21034 64808 616539 0)) +;;;### (autoloads nil "epg" "epg.el" (21069 17449 167398 0)) ;;; Generated autoloads from epg.el (push (purecopy '(epg 1 0 0)) package--builtin-versions) + (autoload 'epg-make-context "epg" "\ Return a context object. @@ -8791,6 +8814,7 @@ ;;;### (autoloads nil "erc" "erc/erc.el" (21053 29224 547064 0)) ;;; Generated autoloads from erc/erc.el (push (purecopy '(erc 5 3)) package--builtin-versions) + (autoload 'erc-select-read-args "erc" "\ Prompt the user for values of nick, server, port, and password. @@ -9021,12 +9045,14 @@ ;;;;;; 0)) ;;; Generated autoloads from erc/erc-lang.el (push (purecopy '(erc-lang 1 0 0)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21050 53033 774595 ;;;;;; 0)) ;;; Generated autoloads from erc/erc-list.el -(push (purecopy '(erc-list 0 1)) package--builtin-versions) (autoload 'erc-list-mode "erc-list") +(push (purecopy '(erc-list 0 1)) package--builtin-versions) + (autoload 'erc-list-mode "erc-list") ;;;*** @@ -9300,7 +9326,7 @@ ;;;*** -;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21048 11307 937592 +;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21099 38568 469572 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/ert.el @@ -9310,8 +9336,8 @@ BODY is evaluated as a `progn' when the test is run. It should signal a condition on failure or just return if the test passes. -`should', `should-not' and `should-error' are useful for -assertions in BODY. +`should', `should-not', `should-error' and `skip-unless' are +useful for assertions in BODY. Use `ert' to run tests interactively. @@ -9394,6 +9420,7 @@ ;;;;;; 0)) ;;; Generated autoloads from eshell/eshell.el (push (purecopy '(eshell 2 4 2)) package--builtin-versions) + (autoload 'eshell "eshell" "\ Create an interactive Eshell buffer. The buffer used for Eshell sessions is determined by the value of @@ -10048,7 +10075,7 @@ ;;;*** -;;;### (autoloads nil "eww" "net/eww.el" (21049 14338 391345 0)) +;;;### (autoloads nil "eww" "net/eww.el" (21086 26537 509049 0)) ;;; Generated autoloads from net/eww.el (autoload 'eww "eww" "\ @@ -10229,7 +10256,7 @@ ;;;*** -;;;### (autoloads nil "face-remap" "face-remap.el" (20928 40842 890989 +;;;### (autoloads nil "face-remap" "face-remap.el" (21082 29482 330637 ;;;;;; 0)) ;;; Generated autoloads from face-remap.el @@ -10324,11 +10351,9 @@ - Decrease the default face height by one step 0 Reset the default face height to the global default -When adjusting with `+' or `-', continue to read input events and -further adjust the face height as long as the input event read -\(with all modifiers removed) is `+' or `-'. - -When adjusting with `0', immediately finish. +After adjusting, continue to read input events and further adjust +the face height as long as the input event read +\(with all modifiers removed) is one of the above characters. Each step scales the height of the default face by the variable `text-scale-mode-step' (a negative number of steps decreases the @@ -10395,6 +10420,7 @@ ;;;;;; 0)) ;;; Generated autoloads from mail/feedmail.el (push (purecopy '(feedmail 11)) package--builtin-versions) + (autoload 'feedmail-send-it "feedmail" "\ Send the current mail buffer using the Feedmail package. This is a suitable value for `send-mail-function'. It can be used @@ -10445,7 +10471,7 @@ ;;;*** -;;;### (autoloads nil "ffap" "ffap.el" (20998 4934 952905 0)) +;;;### (autoloads nil "ffap" "ffap.el" (21090 23592 994673 0)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10661,6 +10687,7 @@ ;;;;;; 0)) ;;; Generated autoloads from find-cmd.el (push (purecopy '(find-cmd 0 6)) package--builtin-versions) + (autoload 'find-cmd "find-cmd" "\ Initiate the building of a find command. For example: @@ -10990,6 +11017,7 @@ ;;;### (autoloads nil "finder" "finder.el" (21031 2230 839140 0)) ;;; Generated autoloads from finder.el (push (purecopy '(finder 1 0)) package--builtin-versions) + (autoload 'finder-list-keywords "finder" "\ Display descriptions of the keywords in the Finder buffer. @@ -11050,6 +11078,7 @@ ;;;;;; 84796 0)) ;;; Generated autoloads from progmodes/flymake.el (push (purecopy '(flymake 0 3)) package--builtin-versions) + (autoload 'flymake-mode "flymake" "\ Toggle on-the-fly syntax checking. With a prefix argument ARG, enable the mode if ARG is positive, @@ -11150,6 +11179,7 @@ ;;;;;; 0)) ;;; Generated autoloads from foldout.el (push (purecopy '(foldout 1 10)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "follow" "follow.el" (21049 14338 391345 0)) @@ -11224,6 +11254,7 @@ ;;;;;; 907104 0)) ;;; Generated autoloads from mail/footnote.el (push (purecopy '(footnote 0 19)) package--builtin-versions) + (autoload 'footnote-mode "footnote" "\ Toggle Footnote mode. With a prefix argument ARG, enable Footnote mode if ARG is @@ -11567,6 +11598,7 @@ ;;;;;; 124734 677000)) ;;; Generated autoloads from play/gamegrid.el (push (purecopy '(gamegrid 1 2)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21042 58928 @@ -11800,7 +11832,8 @@ ;;;### (autoloads nil "gnus" "gnus/gnus.el" (21002 1963 769129 0)) ;;; Generated autoloads from gnus/gnus.el -(push (purecopy '(gnus 5 13)) package--builtin-versions)(when (fboundp 'custom-autoload) +(push (purecopy '(gnus 5 13)) package--builtin-versions) +(when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) (autoload 'gnus-slave-no-server "gnus" "\ @@ -12152,8 +12185,8 @@ ;;;*** -;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21040 17194 -;;;;;; 398147 0)) +;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21104 56491 +;;;;;; 538513 0)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -13971,6 +14004,7 @@ ;;;;;; 0)) ;;; Generated autoloads from hippie-exp.el (push (purecopy '(hippie-exp 1 6)) package--builtin-versions) + (defvar hippie-expand-try-functions-list '(try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol) "\ The list of expansion functions tried in order by `hippie-expand'. To change the behavior of `hippie-expand', remove, change the order of, @@ -14209,10 +14243,11 @@ ;;;*** -;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (20938 49065 -;;;;;; 383398 0)) +;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21105 28578 +;;;;;; 135432 0)) ;;; Generated autoloads from htmlfontify.el (push (purecopy '(htmlfontify 0 21)) package--builtin-versions) + (autoload 'htmlfontify-buffer "htmlfontify" "\ Create a new buffer, named for the current buffer + a .html extension, containing an inline CSS-stylesheet and formatted CSS-markup HTML @@ -14331,8 +14366,8 @@ ;;;*** -;;;### (autoloads nil "ibuffer" "ibuffer.el" (21045 35440 130128 -;;;;;; 609000)) +;;;### (autoloads nil "ibuffer" "ibuffer.el" (21105 26139 752484 +;;;;;; 0)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -14371,10 +14406,11 @@ ;;;*** -;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (20709 -;;;;;; 26818 907104 0)) +;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21077 +;;;;;; 65494 651556 676000)) ;;; Generated autoloads from calendar/icalendar.el (push (purecopy '(icalendar 0 19)) package--builtin-versions) + (autoload 'icalendar-export-file "icalendar" "\ Export diary file to iCalendar format. All diary entries in the file DIARY-FILENAME are converted to iCalendar @@ -14424,7 +14460,7 @@ ;;;*** -;;;### (autoloads nil "icomplete" "icomplete.el" (21047 23047 743647 +;;;### (autoloads nil "icomplete" "icomplete.el" (21091 44456 774347 ;;;;;; 0)) ;;; Generated autoloads from icomplete.el @@ -14518,6 +14554,7 @@ ;;;;;; 117790 0)) ;;; Generated autoloads from progmodes/idlwave.el (push (purecopy '(idlwave 6 1 22)) package--builtin-versions) + (autoload 'idlwave-mode "idlwave" "\ Major mode for editing IDL source files (version 6.1_em22). @@ -14642,7 +14679,7 @@ ;;;*** -;;;### (autoloads nil "ido" "ido.el" (20996 49577 892030 0)) +;;;### (autoloads nil "ido" "ido.el" (21103 35626 321341 0)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14901,12 +14938,13 @@ ;;;*** -;;;### (autoloads nil "ielm" "ielm.el" (20903 10024 645978 0)) +;;;### (autoloads nil "ielm" "ielm.el" (21089 2732 351717 0)) ;;; Generated autoloads from ielm.el (autoload 'ielm "ielm" "\ Interactively evaluate Emacs Lisp expressions. Switches to the buffer `*ielm*', or creates it if it does not exist. +See `inferior-emacs-lisp-mode' for details. \(fn)" t nil) @@ -14928,7 +14966,7 @@ ;;;*** -;;;### (autoloads nil "image" "image.el" (21049 14338 391345 0)) +;;;### (autoloads nil "image" "image.el" (21107 32686 465643 0)) ;;; Generated autoloads from image.el (autoload 'image-type-from-data "image" "\ @@ -15082,7 +15120,7 @@ \(fn SPECS)" nil nil) (autoload 'defimage "image" "\ -Define SYMBOL as an image. +Define SYMBOL as an image, and return SYMBOL. SPECS is a list of image specifications. DOC is an optional documentation string. @@ -15125,6 +15163,7 @@ ;;;;;; 737658 0)) ;;; Generated autoloads from image-dired.el (push (purecopy '(image-dired 0 4 11)) package--builtin-versions) + (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ Toggle thumbnails in front of file names in the dired buffer. If no marked file could be found, insert or hide thumbnails on the @@ -15538,8 +15577,8 @@ ;;;*** -;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (20774 53405 -;;;;;; 644725 888000)) +;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21098 17703 +;;;;;; 588969 0)) ;;; Generated autoloads from progmodes/inf-lisp.el (autoload 'inferior-lisp "inf-lisp" "\ @@ -15820,6 +15859,7 @@ ;;;;;; 0)) ;;; Generated autoloads from info-xref.el (push (purecopy '(info-xref 3)) package--builtin-versions) + (autoload 'info-xref-check "info-xref" "\ Check external references in FILENAME, an info document. Interactively from an `Info-mode' or `texinfo-mode' buffer the @@ -15949,6 +15989,7 @@ ;;;;;; 425822 0)) ;;; Generated autoloads from cedet/inversion.el (push (purecopy '(inversion 1 3)) package--builtin-versions) + (autoload 'inversion-require-emacs "inversion" "\ Declare that you need either EMACS-VER, XEMACS-VER or SXEMACS-ver. Only checks one based on which kind of Emacs is being run. @@ -15982,6 +16023,7 @@ ;;;;;; 0)) ;;; Generated autoloads from isearchb.el (push (purecopy '(isearchb 1 5)) package--builtin-versions) + (autoload 'isearchb-activate "isearchb" "\ Active isearchb mode for subsequent alphanumeric keystrokes. Executing this command again will terminate the search; or, if @@ -16456,6 +16498,7 @@ ;;;### (autoloads nil "js" "progmodes/js.el" (20998 4934 952905 0)) ;;; Generated autoloads from progmodes/js.el (push (purecopy '(js 9)) package--builtin-versions) + (autoload 'js-mode "js" "\ Major mode for editing JavaScript. @@ -16467,6 +16510,7 @@ ;;;### (autoloads nil "json" "json.el" (20998 4934 952905 0)) ;;; Generated autoloads from json.el (push (purecopy '(json 1 4)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "keypad" "emulation/keypad.el" (20709 26818 @@ -16863,9 +16907,10 @@ ;;;*** -;;;### (autoloads nil "linum" "linum.el" (20709 26818 907104 0)) +;;;### (autoloads nil "linum" "linum.el" (21100 59431 520894 0)) ;;; Generated autoloads from linum.el (push (purecopy '(linum 0 9 24)) package--builtin-versions) + (autoload 'linum-mode "linum" "\ Toggle display of line numbers in the left margin (Linum mode). With a prefix argument ARG, enable Linum mode if ARG is positive, @@ -17026,7 +17071,7 @@ ;;;*** -;;;### (autoloads nil "lpr" "lpr.el" (20975 43430 521692 0)) +;;;### (autoloads nil "lpr" "lpr.el" (21104 56491 538513 0)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ @@ -17630,7 +17675,7 @@ ;;;*** -;;;### (autoloads nil "man" "man.el" (21040 17194 398147 0)) +;;;### (autoloads nil "man" "man.el" (21100 59431 520894 0)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17687,6 +17732,7 @@ ;;;### (autoloads nil "master" "master.el" (20884 7264 912957 506000)) ;;; Generated autoloads from master.el (push (purecopy '(master 1 0 2)) package--builtin-versions) + (autoload 'master-mode "master" "\ Toggle Master mode. With a prefix argument ARG, enable Master mode if ARG is @@ -17737,6 +17783,7 @@ ;;;### (autoloads nil "md4" "md4.el" (20709 26818 907104 0)) ;;; Generated autoloads from md4.el (push (purecopy '(md4 1 0)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "message" "gnus/message.el" (21048 11307 937592 @@ -17909,6 +17956,7 @@ ;;;;;; 62962 290468 0)) ;;; Generated autoloads from progmodes/meta-mode.el (push (purecopy '(meta-mode 1 0)) package--builtin-versions) + (autoload 'metafont-mode "meta-mode" "\ Major mode for editing Metafont sources. @@ -18059,6 +18107,7 @@ ;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (20987 34598 970563 0)) ;;; Generated autoloads from mh-e/mh-e.el (push (purecopy '(mh-e 8 5)) package--builtin-versions) + (put 'mh-progs 'risky-local-variable t) (put 'mh-lib 'risky-local-variable t) @@ -18325,6 +18374,7 @@ ;;;;;; 1963 769129 0)) ;;; Generated autoloads from progmodes/mixal-mode.el (push (purecopy '(mixal-mode 0 1)) package--builtin-versions) + (autoload 'mixal-mode "mixal-mode" "\ Major mode for the mixal asm language. @@ -18611,7 +18661,7 @@ ;;;*** -;;;### (autoloads nil "mpc" "mpc.el" (21049 14338 391345 0)) +;;;### (autoloads nil "mpc" "mpc.el" (21075 56234 349623 0)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -19029,8 +19079,8 @@ ;;;*** -;;;### (autoloads nil "network-stream" "net/network-stream.el" (20984 -;;;;;; 58408 354075 0)) +;;;### (autoloads nil "network-stream" "net/network-stream.el" (21074 +;;;;;; 35375 473679 0)) ;;; Generated autoloads from net/network-stream.el (autoload 'open-network-stream "network-stream" "\ @@ -19203,6 +19253,7 @@ ;;;;;; 907104 0)) ;;; Generated autoloads from net/newsticker.el (push (purecopy '(newsticker 1 99)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (20709 26818 907104 @@ -19247,6 +19298,7 @@ ;;;;;; 907104 0)) ;;; Generated autoloads from gnus/nnmairix.el (push (purecopy '(nnmairix 0 6)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "nnml" "gnus/nnml.el" (20955 58152 201869 0)) @@ -19309,6 +19361,7 @@ ;;;### (autoloads nil "ntlm" "net/ntlm.el" (20709 26818 907104 0)) ;;; Generated autoloads from net/ntlm.el (push (purecopy '(ntlm 1 0)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (20709 26818 @@ -19324,8 +19377,8 @@ ;;;*** -;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (20884 6711 -;;;;;; 386198 0)) +;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21075 56234 +;;;;;; 349623 0)) ;;; Generated autoloads from nxml/nxml-mode.el (autoload 'nxml-mode "nxml-mode" "\ @@ -19399,8 +19452,8 @@ ;;;*** -;;;### (autoloads nil "octave" "progmodes/octave.el" (21065 20391 -;;;;;; 959557 0)) +;;;### (autoloads nil "octave" "progmodes/octave.el" (21098 17703 +;;;;;; 588969 0)) ;;; Generated autoloads from progmodes/octave.el (autoload 'octave-mode "octave" "\ @@ -20153,10 +20206,11 @@ ;;;*** -;;;### (autoloads nil "package" "emacs-lisp/package.el" (21066 41257 -;;;;;; 365840 0)) +;;;### (autoloads nil "package" "emacs-lisp/package.el" (21104 56491 +;;;;;; 538513 0)) ;;; Generated autoloads from emacs-lisp/package.el (push (purecopy '(package 1 0 1)) package--builtin-versions) + (defvar package-enable-at-startup t "\ Whether to activate installed packages when Emacs starts. If non-nil, packages are activated after reading the init file @@ -20189,6 +20243,11 @@ \(fn FILE)" t nil) +(autoload 'package-import-keyring "package" "\ +Import keys from FILE. + +\(fn &optional FILE)" t nil) + (autoload 'package-refresh-contents "package" "\ Download the ELPA archive description if needed. This informs Emacs about the latest versions of all packages, and @@ -20602,7 +20661,7 @@ ;;;*** -;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21052 8364 417872 0)) +;;;### (autoloads nil "pcvs" "vc/pcvs.el" (21104 56491 538513 0)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -20677,8 +20736,8 @@ ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20709 26818 -;;;;;; 907104 0)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (21075 56234 +;;;;;; 349623 0)) ;;; Generated autoloads from vc/pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ @@ -20686,8 +20745,8 @@ ;;;*** -;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (20929 -;;;;;; 34089 117790 0)) +;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21075 +;;;;;; 56234 349623 0)) ;;; Generated autoloads from progmodes/perl-mode.el (put 'perl-indent-level 'safe-local-variable 'integerp) (put 'perl-continued-statement-offset 'safe-local-variable 'integerp) @@ -20938,6 +20997,7 @@ ;;;;;; 0)) ;;; Generated autoloads from printing.el (push (purecopy '(printing 6 9 3)) package--builtin-versions) + (autoload 'pr-interface "printing" "\ Activate the printing interface buffer. @@ -21540,7 +21600,7 @@ ;;;*** -;;;### (autoloads nil "profiler" "profiler.el" (21040 17194 398147 +;;;### (autoloads nil "profiler" "profiler.el" (21077 11573 151993 ;;;;;; 0)) ;;; Generated autoloads from profiler.el @@ -21569,8 +21629,8 @@ ;;;*** -;;;### (autoloads nil "prolog" "progmodes/prolog.el" (20919 46844 -;;;;;; 767888 0)) +;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21099 38568 +;;;;;; 469572 0)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -21620,6 +21680,7 @@ ;;;;;; 848428 0)) ;;; Generated autoloads from progmodes/ps-mode.el (push (purecopy '(ps-mode 1 1 9)) package--builtin-versions) + (autoload 'ps-mode "ps-mode" "\ Major mode for editing PostScript with GNU Emacs. @@ -21663,10 +21724,11 @@ ;;;*** -;;;### (autoloads nil "ps-print" "ps-print.el" (20975 43430 521692 +;;;### (autoloads nil "ps-print" "ps-print.el" (21105 26139 752484 ;;;;;; 0)) ;;; Generated autoloads from ps-print.el (push (purecopy '(ps-print 7 3 5)) package--builtin-versions) + (defvar ps-page-dimensions-database (purecopy (list (list 'a4 (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list 'a3 (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list 'letter (* 72 8.5) (* 72 11.0) "Letter") (list 'legal (* 72 8.5) (* 72 14.0) "Legal") (list 'letter-small (* 72 7.68) (* 72 10.16) "LetterSmall") (list 'tabloid (* 72 11.0) (* 72 17.0) "Tabloid") (list 'ledger (* 72 17.0) (* 72 11.0) "Ledger") (list 'statement (* 72 5.5) (* 72 8.5) "Statement") (list 'executive (* 72 7.5) (* 72 10.0) "Executive") (list 'a4small (* 72 7.47) (* 72 10.85) "A4Small") (list 'b4 (* 72 10.125) (* 72 14.33) "B4") (list 'b5 (* 72 7.16) (* 72 10.125) "B5") '(addresslarge 236.0 99.0 "AddressLarge") '(addresssmall 236.0 68.0 "AddressSmall") '(cuthanging13 90.0 222.0 "CutHanging13") '(cuthanging15 90.0 114.0 "CutHanging15") '(diskette 181.0 136.0 "Diskette") '(eurofilefolder 139.0 112.0 "EuropeanFilefolder") '(eurofoldernarrow 526.0 107.0 "EuroFolderNarrow") '(eurofolderwide 526.0 136.0 "EuroFolderWide") '(euronamebadge 189.0 108.0 "EuroNameBadge") '(euronamebadgelarge 223.0 136.0 "EuroNameBadgeLarge") '(filefolder 230.0 37.0 "FileFolder") '(jewelry 76.0 136.0 "Jewelry") '(mediabadge 180.0 136.0 "MediaBadge") '(multipurpose 126.0 68.0 "MultiPurpose") '(retaillabel 90.0 104.0 "RetailLabel") '(shipping 271.0 136.0 "Shipping") '(slide35mm 26.0 104.0 "Slide35mm") '(spine8mm 187.0 26.0 "Spine8mm") '(topcoated 425.19685 136.0 "TopCoatedPaper") '(topcoatedpaper 396.0 136.0 "TopcoatedPaper150") '(vhsface 205.0 127.0 "VHSFace") '(vhsspine 400.0 50.0 "VHSSpine") '(zipdisk 156.0 136.0 "ZipDisk"))) "\ List associating a symbolic paper type to its width, height and doc media. See `ps-paper-type'.") @@ -21860,16 +21922,18 @@ ;;;*** -;;;### (autoloads nil "pulse" "cedet/pulse.el" (20709 26818 907104 +;;;### (autoloads nil "pulse" "cedet/pulse.el" (21106 11815 370918 ;;;;;; 0)) ;;; Generated autoloads from cedet/pulse.el (push (purecopy '(pulse 1 0)) package--builtin-versions) + ;;;*** -;;;### (autoloads nil "python" "progmodes/python.el" (21040 17194 -;;;;;; 398147 0)) +;;;### (autoloads nil "python" "progmodes/python.el" (21104 56491 +;;;;;; 538513 0)) ;;; Generated autoloads from progmodes/python.el (push (purecopy '(python 0 24 2)) package--builtin-versions) + (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode)) (add-to-list 'interpreter-mode-alist (cons (purecopy "python[0-9.]*") 'python-mode)) @@ -22320,7 +22384,7 @@ ;;;*** -;;;### (autoloads nil "rect" "rect.el" (20709 26818 907104 0)) +;;;### (autoloads nil "rect" "rect.el" (21104 56491 538513 0)) ;;; Generated autoloads from rect.el (autoload 'delete-rectangle "rect" "\ @@ -22452,6 +22516,11 @@ \(fn START END START-AT &optional FORMAT)" t nil) +(autoload 'rectangle-mark "rect" "\ +Toggle the region as rectangular. + +\(fn)" t nil) + ;;;*** ;;;### (autoloads nil "refill" "textmodes/refill.el" (20884 7264 @@ -22662,12 +22731,14 @@ ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/regi.el (push (purecopy '(regi 1 8)) package--builtin-versions) + ;;;*** -;;;### (autoloads nil "remember" "textmodes/remember.el" (20945 22315 -;;;;;; 8369 0)) +;;;### (autoloads nil "remember" "textmodes/remember.el" (21093 51772 +;;;;;; 844670 0)) ;;; Generated autoloads from textmodes/remember.el (push (purecopy '(remember 2 0)) package--builtin-versions) + (autoload 'remember "remember" "\ Remember an arbitrary piece of data. INITIAL is the text to initially place in the *Remember* buffer, @@ -22725,6 +22796,7 @@ ;;;### (autoloads nil "repeat" "repeat.el" (20709 26818 907104 0)) ;;; Generated autoloads from repeat.el (push (purecopy '(repeat 0 51)) package--builtin-versions) + (autoload 'repeat "repeat" "\ Repeat most recently executed command. If REPEAT-ARG is non-nil (interactively, with a prefix argument), @@ -22899,8 +22971,8 @@ ;;;*** -;;;### (autoloads nil "rmail" "mail/rmail.el" (21049 32304 81561 -;;;;;; 723000)) +;;;### (autoloads nil "rmail" "mail/rmail.el" (21105 26139 752484 +;;;;;; 0)) ;;; Generated autoloads from mail/rmail.el (defvar rmail-file-name (purecopy "~/RMAIL") "\ @@ -23347,10 +23419,11 @@ ;;;*** -;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21046 -;;;;;; 55978 585230 0)) +;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21107 +;;;;;; 32686 465643 0)) ;;; Generated autoloads from progmodes/ruby-mode.el (push (purecopy '(ruby-mode 1 2)) package--builtin-versions) + (autoload 'ruby-mode "ruby-mode" "\ Major mode for editing Ruby scripts. \\[ruby-indent-line] properly indents subexpressions of multi-line @@ -23373,6 +23446,7 @@ ;;;;;; 0)) ;;; Generated autoloads from ruler-mode.el (push (purecopy '(ruler-mode 1 6)) package--builtin-versions) + (defvar ruler-mode nil "\ Non-nil if Ruler mode is enabled. Use the command `ruler-mode' to change this variable.") @@ -23703,12 +23777,14 @@ ;;;;;; 907104 0)) ;;; Generated autoloads from net/sasl-ntlm.el (push (purecopy '(sasl 1 0)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "savehist" "savehist.el" (21040 42923 330142 ;;;;;; 838000)) ;;; Generated autoloads from savehist.el (push (purecopy '(savehist 24)) package--builtin-versions) + (defvar savehist-mode nil "\ Non-nil if Savehist mode is enabled. See the command `savehist-mode' for a description of this minor mode. @@ -23836,7 +23912,7 @@ ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (20929 34089 117790 +;;;### (autoloads nil "secrets" "net/secrets.el" (21071 59176 747909 ;;;;;; 0)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) @@ -23848,6 +23924,7 @@ ;;;;;; 690120 156000)) ;;; Generated autoloads from cedet/semantic.el (push (purecopy '(semantic 2 2)) package--builtin-versions) + (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\ List of auxiliary Semantic minor modes enabled by `semantic-mode'. The possible elements of this list include the following: @@ -24356,10 +24433,11 @@ ;;;*** -;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21039 -;;;;;; 31945 0 0)) +;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21097 +;;;;;; 42046 44658 0)) ;;; Generated autoloads from progmodes/sh-script.el -(push (purecopy '(sh-script 2 0 6)) package--builtin-versions)(put 'sh-shell 'safe-local-variable 'symbolp) +(push (purecopy '(sh-script 2 0 6)) package--builtin-versions) +(put 'sh-shell 'safe-local-variable 'symbolp) (autoload 'sh-mode "sh-script" "\ Major mode for editing shell scripts. @@ -24420,8 +24498,8 @@ ;;;*** -;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (20858 21542 -;;;;;; 723007 0)) +;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21082 29482 +;;;;;; 330637 0)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload 'list-load-path-shadows "shadow" "\ @@ -24660,7 +24738,7 @@ ;;;*** -;;;### (autoloads nil "skeleton" "skeleton.el" (20912 25000 802412 +;;;### (autoloads nil "skeleton" "skeleton.el" (21087 47399 892476 ;;;;;; 0)) ;;; Generated autoloads from skeleton.el @@ -25255,10 +25333,11 @@ ;;;*** -;;;### (autoloads nil "sql" "progmodes/sql.el" (20975 10147 44538 +;;;### (autoloads nil "sql" "progmodes/sql.el" (21082 29482 330637 ;;;;;; 0)) ;;; Generated autoloads from progmodes/sql.el (push (purecopy '(sql 3 3)) package--builtin-versions) + (autoload 'sql-add-product-keywords "sql" "\ Add highlighting KEYWORDS for SQL PRODUCT. @@ -25722,6 +25801,7 @@ ;;;;;; 0)) ;;; Generated autoloads from cedet/srecode.el (push (purecopy '(srecode 1 2)) package--builtin-versions) + ;;;*** ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el" @@ -25895,8 +25975,8 @@ ;;;*** -;;;### (autoloads nil "subword" "progmodes/subword.el" (20974 22577 -;;;;;; 548213 0)) +;;;### (autoloads nil "subword" "progmodes/subword.el" (21086 26537 +;;;;;; 509049 0)) ;;; Generated autoloads from progmodes/subword.el (autoload 'subword-mode "subword" "\ @@ -26845,6 +26925,7 @@ ;;;;;; 217000)) ;;; Generated autoloads from play/tetris.el (push (purecopy '(tetris 2 1)) package--builtin-versions) + (autoload 'tetris "tetris" "\ Play the Tetris game. Shapes drop from the top of the screen, and the user has to move and @@ -27498,6 +27579,7 @@ ;;;;;; 561026 0)) ;;; Generated autoloads from textmodes/tildify.el (push (purecopy '(tildify 4 5)) package--builtin-versions) + (autoload 'tildify-region "tildify" "\ Add hard spaces in the region between BEG and END. See variables `tildify-pattern-alist', `tildify-string-alist', and @@ -27737,6 +27819,7 @@ ;;;;;; 58662 278539 0)) ;;; Generated autoloads from calendar/timeclock.el (push (purecopy '(timeclock 2 6 1)) package--builtin-versions) + (defvar timeclock-mode-line-display nil "\ Non-nil if Timeclock-Mode-Line-Display mode is enabled. See the command `timeclock-mode-line-display' for a description of this minor mode. @@ -27865,7 +27948,7 @@ ;;;*** -;;;### (autoloads nil "tmm" "tmm.el" (20764 51137 83502 0)) +;;;### (autoloads nil "tmm" "tmm.el" (21086 55571 430148 991000)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27876,6 +27959,10 @@ X-POSITION, if non-nil, specifies a horizontal position within the menu bar; we make that menu bar item (the one at that position) the default choice. +Note that \\[menu-bar-open] by default drops down TTY menus; if you want it +to invoke `tmm-menubar' instead, customize the variable +`tty-menu-open-use-tmm' to a non-nil value. + \(fn &optional X-POSITION)" t nil) (autoload 'tmm-menubar-mouse "tmm" "\ @@ -28021,10 +28108,11 @@ ;;;*** -;;;### (autoloads nil "tpu-edt" "emulation/tpu-edt.el" (21041 38058 -;;;;;; 75002 0)) +;;;### (autoloads nil "tpu-edt" "emulation/tpu-edt.el" (21105 26139 +;;;;;; 752484 0)) ;;; Generated autoloads from emulation/tpu-edt.el (push (purecopy '(tpu-edt 4 5)) package--builtin-versions) + (defvar tpu-edt-mode nil "\ Non-nil if Tpu-Edt mode is enabled. See the command `tpu-edt-mode' for a description of this minor mode. @@ -28086,7 +28174,7 @@ ;;;*** -;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (20709 26818 907104 +;;;### (autoloads nil "tq" "emacs-lisp/tq.el" (21074 35375 473679 ;;;;;; 0)) ;;; Generated autoloads from emacs-lisp/tq.el @@ -28139,7 +28227,8 @@ ;;;*** -;;;### (autoloads nil "tramp" "net/tramp.el" (21042 58928 39127 0)) +;;;### (autoloads nil "tramp" "net/tramp.el" (21103 35626 321341 +;;;;;; 0)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -28262,8 +28351,8 @@ ;;;*** -;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21008 40741 -;;;;;; 120196 0)) +;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21089 2732 +;;;;;; 351717 0)) ;;; Generated autoloads from net/tramp-ftp.el (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\ @@ -28490,7 +28579,7 @@ ;;;*** -;;;### (autoloads nil "uce" "mail/uce.el" (20709 26818 907104 0)) +;;;### (autoloads nil "uce" "mail/uce.el" (21082 29482 330637 0)) ;;; Generated autoloads from mail/uce.el (autoload 'uce-reply-to-uce "uce" "\ @@ -29346,7 +29435,7 @@ ;;;*** -;;;### (autoloads nil "vc" "vc/vc.el" (21053 29224 547064 0)) +;;;### (autoloads nil "vc" "vc/vc.el" (21098 17703 588969 0)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -29665,7 +29754,7 @@ ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21031 51082 798722 +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (21071 59176 747909 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) @@ -29693,7 +29782,7 @@ ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21052 8364 417872 +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21071 59176 747909 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-cvs.el (defun vc-cvs-registered (f) @@ -29754,7 +29843,7 @@ ;;;*** -;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21041 38058 75002 +;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21067 62128 15681 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-git.el (defun vc-git-registered (file) @@ -29777,7 +29866,7 @@ ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21031 51082 798722 +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21071 59176 747909 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-mtn.el @@ -29794,7 +29883,7 @@ ;;;*** -;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21031 51082 798722 +;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21071 59176 747909 ;;;;;; 0)) ;;; Generated autoloads from vc/vc-rcs.el @@ -29827,8 +29916,8 @@ ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21041 38058 75002 -;;;;;; 0)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21077 42241 670130 +;;;;;; 556000)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29844,7 +29933,8 @@ ;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (20893 ;;;;;; 60586 188550 0)) ;;; Generated autoloads from progmodes/vera-mode.el -(push (purecopy '(vera-mode 2 28)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) +(push (purecopy '(vera-mode 2 28)) package--builtin-versions) + (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'") 'vera-mode)) (autoload 'vera-mode "vera-mode" "\ Major mode for editing Vera code. @@ -29900,7 +29990,7 @@ ;;;*** ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (20992 52525 458637 0)) +;;;;;; (21091 44456 774347 0)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -30008,7 +30098,8 @@ \\[verilog-sk-fork] Insert a fork begin .. end .. join block. \\[verilog-sk-module] Insert a module .. (/*AUTOARG*/);.. endmodule block. \\[verilog-sk-ovm-class] Insert an OVM Class block. - \\[verilog-sk-uvm-class] Insert an UVM Class block. + \\[verilog-sk-uvm-object] Insert an UVM Object block. + \\[verilog-sk-uvm-component] Insert an UVM Component block. \\[verilog-sk-primitive] Insert a primitive .. (.. );.. endprimitive block. \\[verilog-sk-repeat] Insert a repeat (..) begin .. end block. \\[verilog-sk-specify] Insert a specify .. endspecify block. @@ -30967,6 +31058,7 @@ ;;;;;; 0)) ;;; Generated autoloads from emulation/viper.el (push (purecopy '(viper 3 14 1)) package--builtin-versions) + (autoload 'toggle-viper-mode "viper" "\ Toggle Viper on/off. If Viper is enabled, turn it off. Otherwise, turn it on. @@ -31073,6 +31165,7 @@ ;;;### (autoloads nil "wdired" "wdired.el" (21049 14338 391345 0)) ;;; Generated autoloads from wdired.el (push (purecopy '(wdired 2 0)) package--builtin-versions) + (autoload 'wdired-change-to-wdired-mode "wdired" "\ Put a Dired buffer in Writable Dired (WDired) mode. \\ @@ -31139,6 +31232,7 @@ ;;;;;; 0)) ;;; Generated autoloads from whitespace.el (push (purecopy '(whitespace 13 2 2)) package--builtin-versions) + (autoload 'whitespace-mode "whitespace" "\ Toggle whitespace visualization (Whitespace mode). With a prefix argument ARG, enable Whitespace mode if ARG is @@ -31685,6 +31779,7 @@ ;;;### (autoloads nil "woman" "woman.el" (20999 25770 522517 0)) ;;; Generated autoloads from woman.el (push (purecopy '(woman 0 551)) package--builtin-versions) + (defvar woman-locale nil "\ String specifying a manual page locale, or nil. If a manual page is available in the specified locale @@ -31734,6 +31829,7 @@ ;;;;;; 398147 0)) ;;; Generated autoloads from emulation/ws-mode.el (push (purecopy '(ws-mode 0 7)) package--builtin-versions) + (autoload 'wordstar-mode "ws-mode" "\ Major mode with WordStar-like key bindings. @@ -31807,7 +31903,7 @@ ;;;*** -;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (20998 4934 952905 +;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (21075 56234 349623 ;;;;;; 0)) ;;; Generated autoloads from nxml/xmltok.el @@ -32087,7 +32183,7 @@ ;;;;;; "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el" ;;;;;; "vc/pcvs-util.el" "vc/vc-dav.el" "vcursor.el" "vt-control.el" ;;;;;; "vt100-led.el" "w32-common-fns.el" "w32-fns.el" "w32-vars.el" -;;;;;; "x-dnd.el") (21066 41280 469799 289000)) +;;;;;; "x-dnd.el") (21107 32938 48648 817000)) ;;;*** ------------------------------------------------------------ revno: 114892 committer: Glenn Morris branch nick: trunk timestamp: Fri 2013-11-01 06:17:43 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2013-10-28 10:17:40 +0000 +++ autogen/configure 2013-11-01 10:17:43 +0000 @@ -4041,7 +4041,7 @@ "$datarootdir" "$bindir" "$datadir" "$sharedstatedir" "$libexecdir"; do case "$var" in - *[^\ -~]*) as_fn_error "Emacs cannot be built or installed in a directory whose name contains non-ASCII characters: $var" "$LINENO" 5 ;; + *[!\ -~]*) as_fn_error "Emacs cannot be built or installed in a directory whose name contains non-ASCII characters: $var" "$LINENO" 5 ;; esac done ------------------------------------------------------------ revno: 114891 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-11-01 12:00:47 +0200 message: Fix whitespace in src/casefiddle.c. diff: === modified file 'src/casefiddle.c' --- src/casefiddle.c 2013-08-06 05:30:18 +0000 +++ src/casefiddle.c 2013-11-01 10:00:47 +0000 @@ -102,7 +102,7 @@ inword = (SYNTAX (c) == Sword); if (c != c1) { - MAKE_CHAR_UNIBYTE (c); + MAKE_CHAR_UNIBYTE (c); /* If the char can't be converted to a valid byte, just don't change it. */ if (c >= 0 && c < 256) ------------------------------------------------------------ revno: 114890 author: Claudio Bley committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-11-01 11:18:39 +0200 message: Fix ChangeLog entry of last commit. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-01 09:10:13 +0000 +++ src/ChangeLog 2013-11-01 09:18:39 +0000 @@ -1,6 +1,7 @@ 2013-11-01 Claudio Bley - * image.c (pbm_next_char): New function. + * image.c (pbm_next_char): New function. See + http://netpbm.sourceforge.net/doc/pbm.html for the details. (pbm_scan_number): Use it. (Qlibjpeg_version): New variable. (syms_of_image): DEFSYM and initialize it. ------------------------------------------------------------ revno: 114889 author: Claudio Bley committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-11-01 11:10:13 +0200 message: Fix handling of comments in NetPBM image files. src/image.c (pbm_next_char): New function. (pbm_scan_number): Use it. lisp/image.el (image-type-header-regexps): Fix the 'pbm' part to allow comments in pbm files. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 09:04:16 +0000 +++ lisp/ChangeLog 2013-11-01 09:10:13 +0000 @@ -1,5 +1,8 @@ 2013-11-01 Claudio Bley + * image.el (image-type-header-regexps): Fix the 'pbm' part to + allow comments in pbm files. + * term/w32-win.el (dynamic-library-alist): Support newer versions of libjpeg starting with v7: look only for the DLL from the version against which Emacs was built. === modified file 'lisp/image.el' --- lisp/image.el 2013-10-27 23:04:16 +0000 +++ lisp/image.el 2013-11-01 09:10:13 +0000 @@ -34,7 +34,10 @@ (defconst image-type-header-regexps `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm) - ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm) + ("\\`P[1-6]\\\(?:\ +\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[[:space:]]\\)+\ +\\(?:\\(?:#[^\r\n]*[\r\n]\\)?[0-9]\\)+\ +\\)\\{2\\}" . pbm) ("\\`GIF8[79]a" . gif) ("\\`\x89PNG\r\n\x1a\n" . png) ("\\`[\t\n\r ]*#define \\([a-z0-9_]+\\)_width [0-9]+\n\ === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-01 08:52:22 +0000 +++ src/ChangeLog 2013-11-01 09:10:13 +0000 @@ -1,6 +1,8 @@ 2013-11-01 Claudio Bley - * image.c (Qlibjpeg_version): New variable. + * image.c (pbm_next_char): New function. + (pbm_scan_number): Use it. + (Qlibjpeg_version): New variable. (syms_of_image): DEFSYM and initialize it. 2013-10-31 Jan Djärv === modified file 'src/image.c' --- src/image.c 2013-11-01 08:52:22 +0000 +++ src/image.c 2013-11-01 09:10:13 +0000 @@ -5106,6 +5106,27 @@ } +/* Get next char skipping comments in Netpbm header. Returns -1 at + end of input. */ + +static int +pbm_next_char (unsigned char **s, unsigned char *end) +{ + int c = -1; + + while (*s < end && (c = *(*s)++, c == '#')) + { + /* Skip to the next line break. */ + while (*s < end && (c = *(*s)++, c != '\n' && c != '\r')) + ; + + c = -1; + } + + return c; +} + + /* Scan a decimal number from *S and return it. Advance *S while reading the number. END is the end of the string. Value is -1 at end of input. */ @@ -5115,28 +5136,16 @@ { int c = 0, val = -1; - while (*s < end) + /* Skip white-space. */ + while ((c = pbm_next_char (s, end)) != -1 && c_isspace (c)) + ; + + if (c_isdigit (c)) { - /* Skip white-space. */ - while (*s < end && (c = *(*s)++, c_isspace (c))) - ; - - if (c == '#') - { - /* Skip comment to end of line. */ - while (*s < end && (c = *(*s)++, c != '\n')) - ; - } - else if (c_isdigit (c)) - { - /* Read decimal number. */ - val = c - '0'; - while (*s < end && (c = *(*s)++, c_isdigit (c))) - val = 10 * val + c - '0'; - break; - } - else - break; + /* Read decimal number. */ + val = c - '0'; + while ((c = pbm_next_char (s, end)) != -1 && c_isdigit (c)) + val = 10 * val + c - '0'; } return val; ------------------------------------------------------------ revno: 114888 author: Claudio Bley committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-11-01 11:04:16 +0200 message: lisp/term/w32-win.el (dynamic-library-alist): Support libtiff v4.x on w32. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 08:57:55 +0000 +++ lisp/ChangeLog 2013-11-01 09:04:16 +0000 @@ -4,6 +4,7 @@ of libjpeg starting with v7: look only for the DLL from the version against which Emacs was built. Support versions of libpng beyond 1.4.x. + Support libtiff v4.x. 2013-11-01 Bozhidar Batsov === modified file 'lisp/term/w32-win.el' --- lisp/term/w32-win.el 2013-11-01 08:57:55 +0000 +++ lisp/term/w32-win.el 2013-11-01 09:04:16 +0000 @@ -228,7 +228,7 @@ '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll" ;; these are libpng 1.2.8 from GTK+ "libpng13d.dll" "libpng13.dll")) - '(tiff "libtiff3.dll" "libtiff.dll") + '(tiff "libtiff-5.dll" "libtiff3.dll" "libtiff.dll") (if (> libjpeg-version 62) ;; Versions of libjpeg after 6b are incompatible with ;; earlier versions, and each of versions 7, 8, and 9 is ------------------------------------------------------------ revno: 114887 author: Claudio Bley committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-11-01 10:57:55 +0200 message: Support libpng DLLs of versions beyond 1.4.x on MS-Windows. lisp/term/w32-win.el (dynamic-library-alist): Support versions of libpng beyond 1.4.x. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 08:52:22 +0000 +++ lisp/ChangeLog 2013-11-01 08:57:55 +0000 @@ -3,6 +3,7 @@ * term/w32-win.el (dynamic-library-alist): Support newer versions of libjpeg starting with v7: look only for the DLL from the version against which Emacs was built. + Support versions of libpng beyond 1.4.x. 2013-11-01 Bozhidar Batsov === modified file 'lisp/term/w32-win.el' --- lisp/term/w32-win.el 2013-11-01 08:52:22 +0000 +++ lisp/term/w32-win.el 2013-11-01 08:57:55 +0000 @@ -216,8 +216,15 @@ ;; the version we were compiled against. (If we were compiled ;; without PNG support, libpng-version's value is -1.) (if (>= libpng-version 10400) - ;; libpng14-14.dll is libpng 1.4.3 from GTK+ - '(png "libpng14-14.dll" "libpng14.dll") + (let ((major (/ libpng-version 10000)) + (minor (mod (/ libpng-version 100) 10))) + (list 'png + ;; libpngXY.dll is the default name when building + ;; with CMake or from a lpngXYY tarball on w32, + ;; libpngXY-XY.dll is the DLL name when building + ;; with libtool / autotools + (format "libpng%d%d.dll" major minor) + (format "libpng%d%d-%d%d.dll" major minor major minor))) '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll" ;; these are libpng 1.2.8 from GTK+ "libpng13d.dll" "libpng13.dll")) ------------------------------------------------------------ revno: 114886 author: Claudio Bley committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-11-01 10:52:22 +0200 message: Support newer versions of libjpeg on MS-Windows. src/image.c (Qlibjpeg_version): New variable. (syms_of_image): DEFSYM and initialize it. lisp/term/w32-win.el (dynamic-library-alist): Support newer versions of libjpeg starting with v7: look only for the DLL from the version against which Emacs was built. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-01 03:35:35 +0000 +++ lisp/ChangeLog 2013-11-01 08:52:22 +0000 @@ -1,3 +1,9 @@ +2013-11-01 Claudio Bley + + * term/w32-win.el (dynamic-library-alist): Support newer versions + of libjpeg starting with v7: look only for the DLL from the + version against which Emacs was built. + 2013-11-01 Bozhidar Batsov * progmodes/ruby-mode.el (ruby-indent-tabs-mode) === modified file 'lisp/term/w32-win.el' --- lisp/term/w32-win.el 2013-10-10 15:30:21 +0000 +++ lisp/term/w32-win.el 2013-11-01 08:52:22 +0000 @@ -221,8 +221,17 @@ '(png "libpng12d.dll" "libpng12.dll" "libpng3.dll" "libpng.dll" ;; these are libpng 1.2.8 from GTK+ "libpng13d.dll" "libpng13.dll")) - '(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll") '(tiff "libtiff3.dll" "libtiff.dll") + (if (> libjpeg-version 62) + ;; Versions of libjpeg after 6b are incompatible with + ;; earlier versions, and each of versions 7, 8, and 9 is + ;; also incompatible with the preceding ones (the core data + ;; structures used for communications with the library + ;; gained additional members with each new version). So we + ;; must use only the version of the library which Emacs was + ;; compiled against. + (list 'jpeg (format "libjpeg-%d.dll" (/ libjpeg-version 10))) + '(jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")) ;; Versions of giflib 5.0.0 and later changed signatures of ;; several functions used by Emacs, which makes those versions ;; incompatible with previous ones. We select the correct === modified file 'src/ChangeLog' --- src/ChangeLog 2013-10-31 08:32:42 +0000 +++ src/ChangeLog 2013-11-01 08:52:22 +0000 @@ -1,3 +1,8 @@ +2013-11-01 Claudio Bley + + * image.c (Qlibjpeg_version): New variable. + (syms_of_image): DEFSYM and initialize it. + 2013-10-31 Jan Djärv * emacs.c (main): Skip -psn args on OSX even if ! isatty (0). === modified file 'src/image.c' --- src/image.c 2013-10-28 21:19:38 +0000 +++ src/image.c 2013-11-01 08:52:22 +0000 @@ -87,11 +87,12 @@ #define x_defined_color w32_defined_color #define DefaultDepthOfScreen(screen) (one_w32_display_info.n_cbits) -/* Versions of libpng and libgif that we were compiled with, or -1 if - no PNG/GIF support was compiled in. This is tested by w32-win.el - to correctly set up the alist used to search for the respective - image libraries. */ -Lisp_Object Qlibpng_version, Qlibgif_version; +/* Versions of libpng, libgif, and libjpeg that we were compiled with, + or -1 if no PNG/GIF support was compiled in. This is tested by + w32-win.el to correctly set up the alist used to search for the + respective image libraries. */ +Lisp_Object Qlibpng_version, Qlibgif_version, Qlibjpeg_version; + #endif /* HAVE_NTGUI */ #ifdef HAVE_NS @@ -9411,6 +9412,14 @@ #else make_number (-1) #endif + ); + DEFSYM (Qlibjpeg_version, "libjpeg-version"); + Fset (Qlibjpeg_version, +#if HAVE_JPEG + make_number (JPEG_LIB_VERSION) +#else + make_number (-1) +#endif ); #endif ------------------------------------------------------------ revno: 114885 author: Bozhidar Batsov committer: Dmitry Gutov branch nick: trunk timestamp: Fri 2013-11-01 07:35:35 +0400 message: * lisp/progmodes/ruby-mode.el (ruby-indent-tabs-mode) (ruby-indent-level, ruby-comment-column, ruby-deep-arglist): Add property :safe. (ruby-deep-arglist): Add property :type. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-31 07:27:35 +0000 +++ lisp/ChangeLog 2013-11-01 03:35:35 +0000 @@ -1,3 +1,10 @@ +2013-11-01 Bozhidar Batsov + + * progmodes/ruby-mode.el (ruby-indent-tabs-mode) + (ruby-indent-level, ruby-comment-column, ruby-deep-arglist): + Add property :safe. + (ruby-deep-arglist): Add property :type. + 2013-10-31 Glenn Morris * Makefile.in (custom-deps, finder-data): No need to setq the target === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-10-27 03:25:03 +0000 +++ lisp/progmodes/ruby-mode.el 2013-11-01 03:35:35 +0000 @@ -216,20 +216,28 @@ (defcustom ruby-indent-tabs-mode nil "Indentation can insert tabs in Ruby mode if this is non-nil." - :type 'boolean :group 'ruby) + :type 'boolean + :group 'ruby + :safe 'booleanp) (defcustom ruby-indent-level 2 "Indentation of Ruby statements." - :type 'integer :group 'ruby) + :type 'integer + :group 'ruby + :safe 'integerp) (defcustom ruby-comment-column (default-value 'comment-column) "Indentation column of comments." - :type 'integer :group 'ruby) + :type 'integer + :group 'ruby + :safe 'integerp) (defcustom ruby-deep-arglist t "Deep indent lists in parenthesis when non-nil. Also ignores spaces after parenthesis when 'space." - :group 'ruby) + :type 'boolean + :group 'ruby + :safe 'booleanp) (defcustom ruby-deep-indent-paren '(?\( ?\[ ?\] t) "Deep indent lists in parenthesis when non-nil. @@ -260,12 +268,6 @@ "Use `ruby-encoding-map' to set encoding magic comment if this is non-nil." :type 'boolean :group 'ruby) -;; Safe file variables -(put 'ruby-indent-tabs-mode 'safe-local-variable 'booleanp) -(put 'ruby-indent-level 'safe-local-variable 'integerp) -(put 'ruby-comment-column 'safe-local-variable 'integerp) -(put 'ruby-deep-arglist 'safe-local-variable 'booleanp) - ;;; SMIE support (require 'smie)