A bunch of small fixes.
This commit is contained in:
parent
b2ffe6f4d6
commit
4d1530b9d8
3
.gitignore
vendored
3
.gitignore
vendored
@ -7,3 +7,6 @@ places
|
||||
backups
|
||||
eshell
|
||||
url
|
||||
bookmarks
|
||||
|
||||
elpa/archives/
|
||||
|
@ -1,177 +0,0 @@
|
||||
(1
|
||||
(ack .
|
||||
[(0 9)
|
||||
nil "Interface to ack, a source code search tool" tar])
|
||||
(adaptive-wrap .
|
||||
[(0 2)
|
||||
nil "Smart line-wrapping with wrap-prefix" single])
|
||||
(all .
|
||||
[(1 0)
|
||||
nil "Edit all lines matching a given regexp" single])
|
||||
(auctex .
|
||||
[(11 86)
|
||||
nil "Integrated environment for *TeX*" tar])
|
||||
(cl-lib .
|
||||
[(0 2)
|
||||
nil "Properly prefixed CL functions and macros" single])
|
||||
(coffee-mode .
|
||||
[(0 4 1)
|
||||
nil "Major mode for CoffeeScript files" tar])
|
||||
(company .
|
||||
[(0 6 7)
|
||||
nil "Modular in-buffer completion framework" tar])
|
||||
(csv-mode .
|
||||
[(1 1)
|
||||
nil "Major mode for editing comma/char separated values" single])
|
||||
(debbugs .
|
||||
[(0 4)
|
||||
nil "SOAP library to access debbugs servers" tar])
|
||||
(dict-tree .
|
||||
[(0 12 8)
|
||||
((trie
|
||||
(0 2 5))
|
||||
(tNFA
|
||||
(0 1 1))
|
||||
(heap
|
||||
(0 3)))
|
||||
"Dictionary data structure" single])
|
||||
(djvu .
|
||||
[(0 5)
|
||||
nil "Edit and view Djvu files via djvused" single])
|
||||
(docbook .
|
||||
[(0 1)
|
||||
nil "Info-like viewer for DocBook" single])
|
||||
(ediprolog .
|
||||
[(1 0)
|
||||
nil "Emacs Does Interactive Prolog" single])
|
||||
(eldoc-eval .
|
||||
[(0 1)
|
||||
nil "Enable eldoc support when minibuffer is in use." single])
|
||||
(enwc .
|
||||
[(1 0)
|
||||
nil "The Emacs Network Client" tar])
|
||||
(epoch-view .
|
||||
[(0 0 1)
|
||||
nil "Minor mode to visualize epoch timestamps" single])
|
||||
(f90-interface-browser .
|
||||
[(1 1)
|
||||
nil "Parse and browse f90 interfaces" single])
|
||||
(ggtags .
|
||||
[(0 6 3)
|
||||
nil "GNU Global source code tagging system" single])
|
||||
(heap .
|
||||
[(0 3)
|
||||
nil "Heap (a.k.a. priority queue) data structure" single])
|
||||
(ioccur .
|
||||
[(2 4)
|
||||
nil "Incremental occur" single])
|
||||
(jgraph-mode .
|
||||
[(1 0)
|
||||
nil "Major mode for Jgraph files" single])
|
||||
(js2-mode .
|
||||
[(20130307)
|
||||
((emacs
|
||||
(24 1)))
|
||||
"Improved JavaScript editing mode" single])
|
||||
(jumpc .
|
||||
[(2 0)
|
||||
nil "jump to previous insertion points" single])
|
||||
(lex .
|
||||
[(1 1)
|
||||
nil "Lexical analyser construction" tar])
|
||||
(lmc .
|
||||
[(1 1)
|
||||
nil "Little Man Computer in Elisp" single])
|
||||
(load-dir .
|
||||
[(0 0 3)
|
||||
nil "Load all Emacs Lisp files in a given directory" single])
|
||||
(markchars .
|
||||
[(0 2 0)
|
||||
nil "Mark chars fitting certain characteristics" single])
|
||||
(memory-usage .
|
||||
[(0 2)
|
||||
nil "Analyze the memory usage of Emacs in various ways" single])
|
||||
(minimap .
|
||||
[(1 0)
|
||||
nil "Sidebar showing a \"mini-map\" of a buffer" single])
|
||||
(muse .
|
||||
[(3 20)
|
||||
nil "Authoring and publishing tool" tar])
|
||||
(nhexl-mode .
|
||||
[(0 1)
|
||||
nil "Minor mode to edit files via hex-dump format" single])
|
||||
(nlinum .
|
||||
[(1 1)
|
||||
nil "Show line numbers in the margin" single])
|
||||
(notes-mode .
|
||||
[(1 30)
|
||||
nil "Organizing on-line note-taking" tar])
|
||||
(num3-mode .
|
||||
[(1 1)
|
||||
nil "highlight groups of digits in long numbers" single])
|
||||
(oauth2 .
|
||||
[(0 8)
|
||||
nil "OAuth 2.0 Authorization Protocol" single])
|
||||
(org .
|
||||
[(20130408)
|
||||
nil "Outline-based notes management and organizer" tar])
|
||||
(quarter-plane .
|
||||
[(0 1)
|
||||
nil "Minor mode for quarter-plane style editing" single])
|
||||
(queue .
|
||||
[(0 1)
|
||||
nil "Queue data structure" single])
|
||||
(rainbow-mode .
|
||||
[(0 7)
|
||||
nil "Colorize color names in buffers" single])
|
||||
(register-list .
|
||||
[(0 1)
|
||||
nil "Interactively list/edit registers" single])
|
||||
(shen-mode .
|
||||
[(0 1)
|
||||
nil "Utilities for working with Shen code." tar])
|
||||
(sisu-mode .
|
||||
[(3 0 3)
|
||||
nil "Major mode for SiSU markup text" single])
|
||||
(smart-operator .
|
||||
[(4 0)
|
||||
nil "Insert operators with surrounding spaces smartly" single])
|
||||
(sml-mode .
|
||||
[(6 4)
|
||||
nil "Major mode for editing (Standard) ML" single])
|
||||
(sokoban .
|
||||
[(1 0 4)
|
||||
nil "Sokoban game for emacs" tar])
|
||||
(svg-clock .
|
||||
[(0 4)
|
||||
nil "Analog clock using Scalable Vector Graphics" single])
|
||||
(tNFA .
|
||||
[(0 1 1)
|
||||
((queue
|
||||
(0 1)))
|
||||
"Tagged non-deterministic finite-state automata" single])
|
||||
(trie .
|
||||
[(0 2 6)
|
||||
((tNFA
|
||||
(0 1 1))
|
||||
(heap
|
||||
(0 3)))
|
||||
"Trie data structure" single])
|
||||
(undo-tree .
|
||||
[(0 6 3)
|
||||
nil "Treat undo history as a tree" single])
|
||||
(uni-confusables .
|
||||
[(0 1)
|
||||
nil "Unicode confusables table" tar])
|
||||
(vlf .
|
||||
[(0 2)
|
||||
nil "View Large Files" single])
|
||||
(windresize .
|
||||
[(0 1)
|
||||
nil "Resize windows interactively" single])
|
||||
(xclip .
|
||||
[(1 0)
|
||||
nil "Emacs Interface to XClip" single])
|
||||
(yasnippet .
|
||||
[(0 8 0)
|
||||
nil "A template system for Emacs" tar]))
|
File diff suppressed because one or more lines are too long
@ -67,7 +67,7 @@ May be set using .dir-locals.el. Checks each entry if set to a list.")
|
||||
|
||||
(defvar ffip-patterns
|
||||
'("*.html" "*.org" "*.txt" "*.md" "*.el" "*.clj" "*.py" "*.rb" "*.js" "*.pl"
|
||||
"*.sh" "*.erl" "*.hs" "*.ml")
|
||||
"*.sh" "*.erl" "*.hs" "*.ml" "*.sql" "*.c" "*.erb")
|
||||
"List of patterns to look for with `find-file-in-project'.")
|
||||
|
||||
(defvar ffip-find-options ""
|
||||
@ -141,6 +141,10 @@ directory they are found in so that they are unique."
|
||||
|
||||
(defvar ffip-project-files-cache '())
|
||||
|
||||
(defun ffip-bust-cache ()
|
||||
(interactive)
|
||||
(setq ffip-project-files-cache '()))
|
||||
|
||||
(defun ffip-get-project-files ()
|
||||
(when (equal (assoc (ffip-project-root) ffip-project-files-cache) nil)
|
||||
(add-to-list 'ffip-project-files-cache `(,(ffip-project-root) ,(ffip-project-files))))
|
||||
|
4
init.el
4
init.el
@ -131,7 +131,8 @@
|
||||
(global-set-key "\C-x\C-d" 'decrease-left-margin)
|
||||
(global-set-key "\C-c\C-c" 'comment-region)
|
||||
(global-set-key "\C-ct" 'testify-run-test)
|
||||
(global-set-key "\C-c\C-t" 'testify-run-case)
|
||||
(global-set-key "\C-c\C-o" 'testify-run-case)
|
||||
(global-set-key "\C-c1" 'evil-mode)
|
||||
|
||||
;; =============================================================================
|
||||
;; ELPA
|
||||
@ -235,3 +236,4 @@
|
||||
'(fci-rule-color "#383838")
|
||||
'(foreground-color "#626262")
|
||||
'(safe-local-variable-values (quote ((python-indent . tab-width) (whitespace-line-column . 80) (lexical-binding . t)))))
|
||||
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 72809658f15c37ee99c3a3e210463ffce34da662
|
||||
Subproject commit e66ba0cd9dba146d7c71052da41dded5a6284a45
|
263
lisp/line-num.el
Normal file
263
lisp/line-num.el
Normal file
@ -0,0 +1,263 @@
|
||||
;;; line-num.el --- Display line numbers in left-margin of buffer.
|
||||
;;
|
||||
;; Filename: line-num.el
|
||||
;; Description: Display line numbers in left-margin of buffer.
|
||||
;; Author: (Darryl Okahata) darrylo@hpsrdmo, Drew Adams
|
||||
;; Maintainer: Drew Adams
|
||||
;; Copyright (C) 1999-2013, Drew Adams, all rights reserved.
|
||||
;; Copyright (C) 1989, Hewlett-Packard, all rights reserved.
|
||||
;; Created: Wed Mar 31 16:18:24 1999
|
||||
;; Version: 21.0
|
||||
;; Last-Updated: Fri Dec 28 10:06:21 2012 (-0800)
|
||||
;; By: dradams
|
||||
;; Update #: 214
|
||||
;; URL: http://www.emacswiki.org/line-num.el
|
||||
;; Doc URL: http://emacswiki.org/LineNumbers
|
||||
;; Keywords: local
|
||||
;; Compatibility: GNU Emacs: 20.x, 21.x, 22.x, 23.x, 24.x
|
||||
;;
|
||||
;; Features that might be required by this library:
|
||||
;;
|
||||
;; None
|
||||
;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;
|
||||
;;; Commentary:
|
||||
;;
|
||||
;; Display line numbers in left-margin of buffer.
|
||||
;;
|
||||
;; New functions defined here:
|
||||
;;
|
||||
;; `display-line-numbers', `toggle-line-numbers-display',
|
||||
;; `turn-on-line-numbers-display', `turn-off-line-numbers-display'.
|
||||
;;
|
||||
;; NOTE: `setnu.el' now provides similar, but generally better,
|
||||
;; functionality.
|
||||
;;
|
||||
;; Original author was Darryl Okahata darrylo@hpsrdmo: The copy on
|
||||
;; which the current (Adams) modifications were made was obtained from
|
||||
;; Rick Kunin (rickk@sperdk).
|
||||
;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;
|
||||
;;; Change Log:
|
||||
;;
|
||||
;; 2004/11/26 dadams
|
||||
;; Replaced decf with setq...1+.
|
||||
;; turn-off-line-numbers-display: Error if not displaying line #s.
|
||||
;; Removed calls to `fit-frame' (and require of fit-frame.el).
|
||||
;; 2000/11/01 dadams
|
||||
;; 1. Added: toggle-line-numbers-display, turn-on-line-numbers-display,
|
||||
;; turn-off-line-numbers-display.
|
||||
;; 2. Added global vars: displaying-line-numbers-p,
|
||||
;; display-line-numbers-format-string, display-line-numbers-first-line,
|
||||
;; display-line-numbers-count, display-line-numbers-buffer-name,
|
||||
;; display-line-numbers-modified-p.
|
||||
;; 1999/04/14 dadams
|
||||
;; Commented out assignment to unused free var: insert-end.
|
||||
;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;
|
||||
;; This program is free software; you can redistribute it and/or modify
|
||||
;; it under the terms of the GNU General Public License as published by
|
||||
;; the Free Software Foundation; either version 2, or (at your option)
|
||||
;; any later version.
|
||||
|
||||
;; This program is distributed in the hope that it will be useful,
|
||||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;; GNU General Public License for more details.
|
||||
|
||||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with this program; see the file COPYING. If not, write to
|
||||
;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
|
||||
;; Floor, Boston, MA 02110-1301, USA.
|
||||
;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;
|
||||
;;; Code:
|
||||
|
||||
;;>> Problem: Tabs at beginning of lines
|
||||
|
||||
;;;;;;;;;;;;;
|
||||
|
||||
|
||||
;;;###autoload
|
||||
(defun display-line-numbers ()
|
||||
"Temporarily display line numbers in left margin of current buffer."
|
||||
(interactive)
|
||||
(or (eq (current-buffer) (window-buffer (selected-window)))
|
||||
(error "Current buffer, %s, is not the selected window's buffer"
|
||||
(buffer-name)))
|
||||
(let ((buffer-read-only nil)
|
||||
(modified (buffer-modified-p))
|
||||
(name buffer-file-name)
|
||||
(point (point-marker))
|
||||
format-string
|
||||
line-number
|
||||
(count 0)
|
||||
nlines
|
||||
first-line)
|
||||
(save-restriction
|
||||
(widen)
|
||||
(save-excursion
|
||||
(setq first-line (window-start (selected-window)))
|
||||
(goto-char first-line)
|
||||
(setq line-number (1+ (count-lines (point-min) (point))))
|
||||
(move-to-window-line -1)
|
||||
(beginning-of-line)
|
||||
(setq nlines (count-lines first-line (point)))
|
||||
(let ((max (+ line-number nlines)))
|
||||
(setq format-string (cond ((< max 100) "%2d ")
|
||||
((< max 1000) "%3d ")
|
||||
((< max 10000) "%4d ")
|
||||
(t "%7d "))))))
|
||||
(save-excursion
|
||||
(unwind-protect
|
||||
(progn
|
||||
(goto-char first-line)
|
||||
;; defeat file locking... don't try this at home, kids!
|
||||
(setq buffer-file-name nil)
|
||||
(while (<= count nlines)
|
||||
(insert-before-markers (format format-string line-number))
|
||||
;;;(setq insert-end (point)) THIS VAR IS FREE - AND UNUSED!
|
||||
(setq line-number (1+ line-number))
|
||||
(setq count (1+ count))
|
||||
(forward-line 1))
|
||||
(set-window-start (selected-window) first-line)
|
||||
(goto-char point)
|
||||
(set-buffer-modified-p modified)
|
||||
(message "<<< Press SPACE to continue >>>")
|
||||
(let ((char (read-char)))
|
||||
(or (eql char ?\ )
|
||||
(setq unread-command-events (list char))))
|
||||
)
|
||||
(goto-char first-line)
|
||||
(let ((n (1+ (- (aref format-string 1) ?0))))
|
||||
(while (> count 0)
|
||||
(setq count (1- count))
|
||||
(delete-char n)
|
||||
(forward-line 1)))
|
||||
(setq buffer-file-name name)
|
||||
(set-buffer-modified-p modified)))))
|
||||
|
||||
;;;-----------------------------------------------------------------
|
||||
|
||||
(defvar displaying-line-numbers-p nil)
|
||||
(make-variable-buffer-local 'displaying-line-numbers-p)
|
||||
(defvar display-line-numbers-format-string nil)
|
||||
(make-variable-buffer-local 'display-line-numbers-format-string)
|
||||
(defvar display-line-numbers-first-line nil)
|
||||
(make-variable-buffer-local 'display-line-numbers-first-line)
|
||||
(defvar display-line-numbers-count 0)
|
||||
(make-variable-buffer-local 'display-line-numbers-count)
|
||||
(defvar display-line-numbers-buffer-name nil)
|
||||
(make-variable-buffer-local 'display-line-numbers-buffer-name)
|
||||
(defvar display-line-numbers-modified-p nil)
|
||||
(make-variable-buffer-local 'display-line-numbers-modified-p)
|
||||
|
||||
;;;###autoload
|
||||
(defun toggle-line-numbers-display (arg)
|
||||
"Display/clear line numbers in left margin of current buffer.
|
||||
With prefix ARG, just number lines in current window, not all lines in
|
||||
buffer."
|
||||
(interactive "P")
|
||||
(if displaying-line-numbers-p
|
||||
(turn-off-line-numbers-display)
|
||||
(turn-on-line-numbers-display arg)))
|
||||
|
||||
;;;###autoload
|
||||
(defun turn-on-line-numbers-display (arg)
|
||||
"Display line numbers in left margin of current buffer.
|
||||
With prefix ARG, just number lines in current window, not all lines in
|
||||
buffer."
|
||||
(interactive "P")
|
||||
(or (eq (current-buffer) (window-buffer (selected-window)))
|
||||
(error "Current buffer, %s, is not the selected window's buffer"
|
||||
(buffer-name)))
|
||||
(let ((buffer-read-only nil)
|
||||
(point (point-marker))
|
||||
line-number
|
||||
nlines)
|
||||
(setq display-line-numbers-buffer-name buffer-file-name)
|
||||
(setq display-line-numbers-modified-p (buffer-modified-p))
|
||||
(save-restriction
|
||||
(widen)
|
||||
(save-excursion
|
||||
(setq display-line-numbers-first-line
|
||||
(if arg
|
||||
(window-start (selected-window))
|
||||
(point-min)))
|
||||
(goto-char display-line-numbers-first-line)
|
||||
(setq line-number (1+ (count-lines (point-min) (point))))
|
||||
(if arg
|
||||
(move-to-window-line -1)
|
||||
(goto-char (point-max)))
|
||||
(beginning-of-line)
|
||||
(setq nlines (count-lines display-line-numbers-first-line (point)))
|
||||
(let ((max (+ line-number nlines)))
|
||||
(setq display-line-numbers-format-string (cond ((< max 100) "%2d ")
|
||||
((< max 1000) "%3d ")
|
||||
((< max 10000) "%4d ")
|
||||
(t "%7d "))))))
|
||||
(save-excursion
|
||||
(condition-case nil
|
||||
(progn
|
||||
(goto-char display-line-numbers-first-line)
|
||||
(setq buffer-file-name nil) ; To prevent saving with line numbers etc.
|
||||
(setq displaying-line-numbers-p t)
|
||||
(while (<= display-line-numbers-count nlines)
|
||||
(insert-before-markers
|
||||
(format display-line-numbers-format-string line-number))
|
||||
(setq line-number (1+ line-number))
|
||||
(setq display-line-numbers-count (1+ display-line-numbers-count))
|
||||
(forward-line 1))
|
||||
(when arg
|
||||
(set-window-start (selected-window) display-line-numbers-first-line))
|
||||
(goto-char point)
|
||||
(set-buffer-modified-p display-line-numbers-modified-p))
|
||||
(error
|
||||
(progn
|
||||
(goto-char display-line-numbers-first-line)
|
||||
(let ((n (1+ (- (aref display-line-numbers-format-string 1) ?0))))
|
||||
(while (> display-line-numbers-count 0)
|
||||
(setq display-line-numbers-count (1- display-line-numbers-count))
|
||||
(delete-char n)
|
||||
(forward-line 1)))
|
||||
(setq buffer-file-name display-line-numbers-buffer-name)
|
||||
(set-buffer-modified-p display-line-numbers-modified-p)
|
||||
(setq displaying-line-numbers-p nil))))))
|
||||
(let ((curr-line (count-lines (window-start) (point))))
|
||||
(when (> curr-line 0) (setq curr-line (1+ curr-line)))
|
||||
(recenter curr-line)))
|
||||
|
||||
;;;###autoload
|
||||
(defun turn-off-line-numbers-display ()
|
||||
"Clear displayed line numbers from left margin of current buffer."
|
||||
(interactive)
|
||||
(unless (eq (current-buffer) (window-buffer (selected-window)))
|
||||
(error "Current buffer, `%s', is not the selected window's buffer"
|
||||
(buffer-name)))
|
||||
(unless displaying-line-numbers-p
|
||||
(error "Not displaying line numbers in buffer `%s'" (buffer-name)))
|
||||
(let ((buffer-read-only nil))
|
||||
(save-excursion
|
||||
(when (boundp 'display-line-numbers-buffer-name)
|
||||
(setq buffer-file-name display-line-numbers-buffer-name))
|
||||
(goto-char display-line-numbers-first-line)
|
||||
(let ((n (1+ (- (aref display-line-numbers-format-string 1) ?0))))
|
||||
(while (> display-line-numbers-count 0)
|
||||
(setq display-line-numbers-count (1- display-line-numbers-count))
|
||||
(delete-char n)
|
||||
(forward-line 1)))
|
||||
(when (boundp 'display-line-numbers-modified-p)
|
||||
(set-buffer-modified-p display-line-numbers-modified-p))
|
||||
(setq displaying-line-numbers-p nil))))
|
||||
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(provide 'line-num)
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;;; line-num.el ends here
|
Loading…
Reference in New Issue
Block a user