Mercurial > emacs

comparison lisp/startup.el @ 109956:ce960720ed3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make obsolete --unibyte argument do nothing (Bug#6886). * src/emacs.c (main): Remove --unibyte handling (Bug#6886). * lisp/startup.el (command-line-1): Issue warning for ignored arguments --unibyte, etc (Bug#6886). * doc/lispref/nonascii.texi (Text Representations): * doc/lispref/loading.texi (Loading Non-ASCII): * doc/lispref/compile.texi (Byte Compilation): Don't mention obsolete --unibyte command-line argument.
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 22 Aug 2010 17:15:20 -0400
parents 6a23dfd2048b
children 280c8ae2476d
comparison
equal deleted inserted replaced
109955:4ed076eb5529 109956:ce960720ed3f
783 (when (string-match "\\`\\(--[^=]*\\)=" argi) 783 (when (string-match "\\`\\(--[^=]*\\)=" argi)
784 (setq argval (substring argi (match-end 0)) 784 (setq argval (substring argi (match-end 0))
785 argi (match-string 1 argi))) 785 argi (match-string 1 argi)))
786 (when (string-match "\\`--." orig-argi) 786 (when (string-match "\\`--." orig-argi)
787 (let ((completion (try-completion argi longopts))) 787 (let ((completion (try-completion argi longopts)))
788 (if (eq completion t) 788 (cond ((eq completion t)
789 (setq argi (substring argi 1)) 789 (setq argi (substring argi 1)))
790 (if (stringp completion) 790 ((stringp completion)
791 (let ((elt (assoc completion longopts))) 791 (let ((elt (assoc completion longopts)))
792 (or elt 792 (unless elt
793 (error "Option `%s' is ambiguous" argi)) 793 (error "Option `%s' is ambiguous" argi))
794 (setq argi (substring (car elt) 1))) 794 (setq argi (substring (car elt) 1))))
795 (setq argval nil 795 (t
796 argi orig-argi))))) 796 (setq argval nil
797 argi orig-argi)))))
797 (cond 798 (cond
798 ;; The --display arg is handled partly in C, partly in Lisp. 799 ;; The --display arg is handled partly in C, partly in Lisp.
799 ;; When it shows up here, we just put it back to be handled 800 ;; When it shows up here, we just put it back to be handled
800 ;; by `command-line-1'. 801 ;; by `command-line-1'.
801 ((member argi '("-d" "-display")) 802 ((member argi '("-d" "-display"))
2229 (setq cl1-line 0) 2230 (setq cl1-line 0)
2230 (unless (< cl1-column 1) 2231 (unless (< cl1-column 1)
2231 (move-to-column (1- cl1-column))) 2232 (move-to-column (1- cl1-column)))
2232 (setq cl1-column 0)) 2233 (setq cl1-column 0))
2233 2234
2235 ;; These command lines now have no effect.
2236 ((string-match "\\`--?\\(no-\\)?\\(uni\\|multi\\)byte$" argi)
2237 (display-warning 'initialization
2238 (format "Ignoring obsolete arg %s" argi)))
2239
2234 ((equal argi "--") 2240 ((equal argi "--")
2235 (setq just-files t)) 2241 (setq just-files t))
2236 (t 2242 (t
2237 ;; We have almost exhausted our options. See if the 2243 ;; We have almost exhausted our options. See if the
2238 ;; user has made any other command-line options available 2244 ;; user has made any other command-line options available