From: Alan Donovan Date: Wed, 30 Oct 2013 02:17:14 +0000 (-0400) Subject: undo CL 19010044 / dbcd720e5396 X-Git-Tag: go1.3beta1~1368 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=75d5c4af7128e8fd6e2df71f631925715784de46;p=gostls13.git undo CL 19010044 / dbcd720e5396 bradfitz reports: > It breaks go-mode on GNU Emacs 22.1.1 as ships with OS X 10.8.6. ««« original CL description misc/emacs: various cleanups - Use #' for function symbols - Remove unused variables - Use declare-function to shut up byte compiler R=adonovan CC=golang-dev https://golang.org/cl/19010044 »»» R=bradfitz CC=golang-dev https://golang.org/cl/19640043 --- diff --git a/misc/emacs/go-mode.el b/misc/emacs/go-mode.el index a2947bb231..b74bc45e8d 100644 --- a/misc/emacs/go-mode.el +++ b/misc/emacs/go-mode.el @@ -41,8 +41,8 @@ (defalias 'go--kill-whole-line (if (fboundp 'kill-whole-line) - #'kill-whole-line - #'kill-entire-line)) + 'kill-whole-line + 'kill-entire-line)) ;; Delete the current line without putting it in the kill-ring. (defun go--delete-whole-line (&optional arg) @@ -57,12 +57,11 @@ (go--kill-whole-line arg))) -(declare-function go--position-bytes "go-mode" (point)) ;; XEmacs unfortunately does not offer position-bytes. We can fall ;; back to just using (point), but it will be incorrect as soon as ;; multibyte characters are being used. (if (fboundp 'position-bytes) - (defalias 'go--position-bytes #'position-bytes) + (defalias 'go--position-bytes 'position-bytes) (defun go--position-bytes (point) point)) (defun go--old-completion-list-style (list) @@ -274,15 +273,15 @@ For mode=set, all covered lines will have this weight." (defvar go-mode-map (let ((m (make-sparse-keymap))) - (define-key m "}" #'go-mode-insert-and-indent) - (define-key m ")" #'go-mode-insert-and-indent) - (define-key m "," #'go-mode-insert-and-indent) - (define-key m ":" #'go-mode-insert-and-indent) - (define-key m "=" #'go-mode-insert-and-indent) - (define-key m (kbd "C-c C-a") #'go-import-add) - (define-key m (kbd "C-c C-j") #'godef-jump) - (define-key m (kbd "C-x 4 C-c C-j") #'godef-jump-other-window) - (define-key m (kbd "C-c C-d") #'godef-describe) + (define-key m "}" 'go-mode-insert-and-indent) + (define-key m ")" 'go-mode-insert-and-indent) + (define-key m "," 'go-mode-insert-and-indent) + (define-key m ":" 'go-mode-insert-and-indent) + (define-key m "=" 'go-mode-insert-and-indent) + (define-key m (kbd "C-c C-a") 'go-import-add) + (define-key m (kbd "C-c C-j") 'godef-jump) + (define-key m (kbd "C-x 4 C-c C-j") 'godef-jump-other-window) + (define-key m (kbd "C-c C-d") 'godef-describe) m) "Keymap used by Go mode to implement electric keys.") @@ -391,7 +390,7 @@ current line will be returned." (defun go-indentation-at-point () (save-excursion - (let (start-nesting) + (let (start-nesting (outindent 0)) (back-to-indentation) (setq start-nesting (go-paren-level)) @@ -421,6 +420,7 @@ current line will be returned." (interactive) (let (indent shift-amt + end (pos (- (point-max) (point))) (point (point)) (beg (line-beginning-position))) @@ -511,7 +511,7 @@ consider binding godef-jump to `M-.', which is the default key for `find-tag': \(add-hook 'go-mode-hook (lambda () - (local-set-key (kbd \"M-.\") #'godef-jump))) + (local-set-key (kbd \"M-.\") 'godef-jump))) Please note that godef is an external dependency. You can install it with @@ -531,7 +531,7 @@ recommended that you look at goflymake '(go--build-font-lock-keywords)) ;; Indentation - (set (make-local-variable 'indent-line-function) #'go-mode-indent-line) + (set (make-local-variable 'indent-line-function) 'go-mode-indent-line) ;; Comments (set (make-local-variable 'comment-start) "// ") @@ -539,12 +539,12 @@ recommended that you look at goflymake (set (make-local-variable 'comment-use-syntax) t) (set (make-local-variable 'comment-start-skip) "\\(//+\\|/\\*+\\)\\s *") - (set (make-local-variable 'beginning-of-defun-function) #'go-beginning-of-defun) - (set (make-local-variable 'end-of-defun-function) #'go-end-of-defun) + (set (make-local-variable 'beginning-of-defun-function) 'go-beginning-of-defun) + (set (make-local-variable 'end-of-defun-function) 'go-end-of-defun) (set (make-local-variable 'parse-sexp-lookup-properties) t) (if (boundp 'syntax-propertize-function) - (set (make-local-variable 'syntax-propertize-function) #'go-propertize-syntax)) + (set (make-local-variable 'syntax-propertize-function) 'go-propertize-syntax)) (set (make-local-variable 'go-dangling-cache) (make-hash-table :test 'eql)) (add-hook 'before-change-functions (lambda (x y) (setq go-dangling-cache (make-hash-table :test 'eql))) t t) @@ -898,13 +898,13 @@ If IGNORE-CASE is non-nil, the comparison is case-insensitive." (mapcar (lambda (file) (let ((sub (substring file (length pkgdir) -2))) (unless (or (go--string-prefix-p "obj/" sub) (go--string-prefix-p "tool/" sub)) - (mapconcat #'identity (cdr (split-string sub "/")) "/")))) + (mapconcat 'identity (cdr (split-string sub "/")) "/")))) (if (file-directory-p dir) (directory-files dir t "\\.a$")))) (if (file-directory-p pkgdir) (go--directory-dirs pkgdir))))) (go-root-and-paths))) - #'string<)) + 'string<)) (defun go-unused-imports-lines () ;; FIXME Technically, -o /dev/null fails in quite some cases (on @@ -994,7 +994,7 @@ description at POINT." (let ((description (cdr (butlast (godef--call point) 1)))) (if (not description) (message "No description found for expression at point") - (message "%s" (mapconcat #'identity description "\n")))) + (message "%s" (mapconcat 'identity description "\n")))) (file-error (message "Could not run godef binary")))) (defun godef-jump (point &optional other-window) @@ -1145,6 +1145,6 @@ for." (go--coverage-make-overlay range (cadr ranges-and-divisor)))) (if (not (eq cur-buffer (current-buffer))) - (display-buffer (current-buffer) #'display-buffer-reuse-window))))) + (display-buffer (current-buffer) 'display-buffer-reuse-window))))) (provide 'go-mode)