Merge branch 'master' of github.com:redguardtoo/emacs.d

Author: yuxiang-zhang

.github/workflows/test.yml

@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  schedule:
+    # build at 00:05 everyday
+    - cron:  '5 0 * * *'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        emacs_version:
+          - 26.3
+          - 27.1
+          - snapshot
+    steps:
+    - uses: purcell/setup-emacs@master
+      with:
+        version: ${{ matrix.emacs_version }}
+
+    - uses: actions/checkout@v2
+
+    - name: Print emacs version
+      run: emacs --version
+
+    - name: Install dependency
+      run: sudo apt install aspell aspell-en
+
+    - name: Run tests
+      run: make test

.gitignore

@@ -31,6 +31,7 @@ cookies
 \#*
 /elpa
 eshell/
+eln-cache/
 semanticdb/
 *.swp
 *~

.travis.yml

@@ -0,0 +1,17 @@
+(when (or (featurep 'esup-child)
+          (fboundp 'profile-dotemacs)
+          (daemonp)
+          (boundp 'startup-now)
+          noninteractive)
+  (setq package-enable-at-startup nil))
+
+(defvar my-computer-has-smaller-memory-p nil
+  "Compiling and install too packages could cost too much memory.")
+
+;; @see https://www.reddit.com/r/emacs/comments/ofhket/further_boost_start_up_time_with_a_simple_tweak/
+;; 10% speed up of startup for my configuration
+(unless my-computer-has-smaller-memory-p
+  (setq gc-cons-percentage 0.6)
+  (setq gc-cons-threshold most-positive-fixnum))
+
+(setq inhibit-startup-message t)

README.org

@@ -22,8 +22,9 @@
 (setq *emacs27* (>= emacs-major-version 27))
 
 ;; don't GC during startup to save time
-(setq gc-cons-percentage 0.6)
-(setq gc-cons-threshold most-positive-fixnum)
+(unless (bound-and-true-p my-computer-has-smaller-memory-p)
+  (setq gc-cons-percentage 0.6)
+  (setq gc-cons-threshold most-positive-fixnum))
 
 ;; {{ emergency security fix
 ;; https://bugs.debian.org/766397
@@ -102,7 +103,6 @@
   (require-init 'init-org t)
   (require-init 'init-python t)
   (require-init 'init-lisp t)
-  (require-init 'init-elisp t)
   (require-init 'init-yasnippet t)
   (require-init 'init-cc-mode t)
   (require-init 'init-linum-mode)
@@ -114,7 +114,7 @@
   (require-init 'init-gnus t)
   (require-init 'init-lua-mode t)
   (require-init 'init-workgroups2 t) ; use native API in lightweight mode
-  (require-init 'init-term-mode t)
+  (require-init 'init-term-mode)
   (require-init 'init-web-mode t)
   (require-init 'init-company t)
   ; (require-init 'init-chinese t) ;; cannot be idle-required

early-init.el

@@ -23,6 +23,7 @@
 (autoload 'shellcop-erase-buffer "shellcop" "" t)
 (autoload 'shellcop-reset-with-new-command "shellcop" "" t)
 (autoload 'shellcop-start "shellcop" "" t)
+(autoload 'shellcop-search-in-shell-buffer-of-other-window "shellcop" "" t)
 (autoload 'mybigword-video2mp3 "mybigword" "" t)
 (autoload 'js2hl-show-thing-at-point "js2hl" "" t)
 (autoload 'js2hl-show-exits "js2hl" "" t)
@@ -31,6 +32,7 @@
 (autoload 'ivy-recentf "ivy" "" t)
 (autoload 'ivy-read "ivy")
 (autoload 'rainbow-mode "rainbow-mode" nil t)
+(autoload 'ffip-diff-mode "find-file-in-project" nil t)
 (autoload 'workgroups-mode "workgroups2" nil t)
 (autoload 'wg-create-workgroup "workgroups2" nil t)
 (autoload 'wg-open-workgroup "workgroups2" nil t)
@@ -91,13 +93,16 @@
 (autoload 'js-comint-send-region "js-comint" "")
 (autoload 'vc-msg-show "vc-msg" "")
 (autoload 'eacl-complete-line "eacl" "")
-(autoload 'eacl-complete-statement "eacl" "")
-(autoload 'eacl-complete-snippet "eacl" "")
-(autoload 'eacl-complete-tag "eacl" "")
 (autoload 'eacl-complete-multiline "eacl" "")
+(autoload 'eacl-complete-line-from-buffer "eacl" "")
+(autoload 'eacl-complete-line-from-buffer-or-project "eacl" "")
 (autoload 'dropdown-list "dropdown-list" "")
 (autoload 'magit-commit-popup "magit" "")
 (autoload 'global-git-gutter-mode "git-gutter" "" t)
+(autoload 'diff-lisp-mark-selected-text-as-a "diff-lisp" "" t)
+(autoload 'diff-lisp-compare-with-b "diff-lisp" "" t)
+(autoload 'shenshou-download-subtitle "shenshou" "" t)
+(autoload 'shenshou-logout-now "shenshou" "" t)
 
 (provide 'init-autoload)
 ;;; init-autoload.el ends here

init.el

@@ -42,31 +42,22 @@
 
   (setq cc-search-directories '("." "/usr/include" "/usr/local/include/*" "../*/include" "$WXWIN/include"))
 
-  ;; {{ @see https://github.com/redguardtoo/cpputils-cmake
+  ;; @see https://github.com/redguardtoo/cpputils-cmake
   ;; In theory, you can write your own Makefile for `flymake-mode' without cmake.
   ;; Nobody actually does it in real world.
 
-  ;; debugging Emacs c code
-  (add-to-list 'imenu-generic-expression '(nil "^DEFUN *(\"\\([a-zA-Z0-9-]+\\)" 1))
+  ;; debugging Emacs C code
+  (push '(nil "^DEFUN *(\"\\([a-zA-Z0-9-]+\\)" 1) imenu-generic-expression )
 
   ;; make a #define be left-aligned
   (setq c-electric-pound-behavior (quote (alignleft))))
 
-;; donot use c-mode-common-hook or cc-mode-hook because many major-modes use this hook
 (defun c-mode-common-hook-setup ()
+  "C/C++ setup."
   (unless (is-buffer-file-temp)
     (my-common-cc-mode-setup)
     (unless (or (derived-mode-p 'java-mode) (derived-mode-p 'groovy-mode))
-      (my-c-mode-setup))
-
-    ;; gtags (GNU global) stuff
-    (when (and (executable-find "global")
-               ;; `man global' to figure out why
-               (not (string-match-p "GTAGS not found"
-                                    (shell-command-to-string "global -p"))))
-      ;; emacs 24.4+ will set up eldoc automatically.
-      ;; so below code is NOT needed.
-      (eldoc-mode 1))))
+      (my-c-mode-setup))))
 (add-hook 'c-mode-common-hook 'c-mode-common-hook-setup)
 
 (provide 'init-cc-mode)

lisp/init-autoload.el

@@ -1,15 +1,5 @@
 ;; -*- coding: utf-8; lexical-binding: t; -*-
 
-;; Use the system clipboard
-;; @see https://www.emacswiki.org/emacs/CopyAndPaste
-;; So `C-y' could paste from clipboard if you are NOT using emacs-nox
-;; I only use `paste-from-x-clipboard', not `C-y'.
-(setq x-select-enable-clipboard t)
-(setq x-select-enable-primary t)
-
-;; kill-ring and clipboard are same? No, it's annoying!
-(setq save-interprogram-paste-before-kill nil)
-
 (defun copy-yank-str (msg &optional clipboard-only)
   (unless clipboard-only (kill-new msg))
   (my-pclip msg)

lisp/init-cc-mode.el

@@ -4,8 +4,12 @@
 
 ;; evil has already integrated company-mode, see evil-integration.el
 
+(defvar my-company-select-by-number-p t
+  "User can press number key to select company candidate.")
+
 (defvar my-company-zero-key-for-filter nil
-  "If t, pressing 0 calls `company-filter-candidates' per company's status.")
+  "If t, pressing 0 calls `company-filter-candidates' per company's status.
+If `my-company-select-by-number-p' is nil, this flag is ignored. ")
 
 (with-eval-after-load 'company
 
@@ -28,7 +32,7 @@ In that case, insert the number."
       (cond
        ((or (cl-find-if (lambda (s) (string-match re s)) company-candidates)
             (> n (length company-candidates))
-            (looking-back "[0-9]+\\.[0-9]*" (line-beginning-position)))
+            (looking-back "[0-9]" (line-beginning-position)))
         (self-insert-command 1))
 
        ((and (eq n 10) my-company-zero-key-for-filter)
@@ -46,11 +50,12 @@ In that case, insert the number."
 
   ;; @see https://oremacs.com/2017/12/27/company-numbers/
   ;; Using digits to select company-mode candidates
-  (let ((map company-active-map))
-    (mapc
-     (lambda (x)
-       (define-key map (format "%d" x) 'my-company-number))
-     (number-sequence 0 9)))
+  (when my-company-select-by-number-p
+    (let ((map company-active-map))
+      (mapc
+       (lambda (x)
+         (define-key map (format "%d" x) 'my-company-number))
+       (number-sequence 0 9))))
 
   (setq company-auto-commit t)
   ;; characters "/ ) . , ;"to trigger auto commit
@@ -116,6 +121,7 @@ In that case, insert the number."
   "Add ispell to the last of `company-backends'."
   (setq company-backends
         (add-to-list 'company-backends 'company-ispell)))
+
 ;; {{ setup company-ispell
 (defun toggle-company-ispell ()
   "Toggle company-ispell."
@@ -125,14 +131,14 @@ In that case, insert the number."
     (setq company-backends (delete 'company-ispell company-backends))
     (message "company-ispell disabled"))
    (t
-    (my-add-ispell-to-company-backends)
+    (push 'company-ispell company-backends)
     (message "company-ispell enabled!"))))
 
 (defun company-ispell-setup ()
   ;; @see https://github.com/company-mode/company-mode/issues/50
   (when (boundp 'company-backends)
     (make-local-variable 'company-backends)
-    (my-add-ispell-to-company-backends)
+    (push 'company-ispell company-backends)
     ;; @see https://github.com/redguardtoo/emacs.d/issues/473
     (cond
      ((and (boundp 'ispell-alternate-dictionary)

lisp/init-clipboard.el

@@ -39,38 +39,57 @@ If no files marked, always operate on current line in dired-mode."
       (error "no more than 2 files should be marked")))))
 
 
+(defun my-dired-support-program (program pattern)
+  "External PROGRAM can open files matching PATTERN."
+  (push (list pattern program) dired-guess-shell-alist-user))
+
 (with-eval-after-load 'dired-x
-  (dolist (file `(((if *unix* "zathura" "open") "pdf" "dvi" "pdf.gz" "ps" "eps")
-                  ("7z x" "rar" "zip" "7z") ; "e" to extract, "x" to extract with full path
-                  ((if *is-a-mac* "open" (my-guess-mplayer-path)) "ogm"
-                   "avi"
-                   "mpg"
-                   "rmvb"
-                   "rm"
-                   "flv"
-                   "wmv"
-                   "mkv"
-                   "mp4"
-                   "m4v"
-                   "wav"
-                   "webm"
-                   "part"
-                   "mov"
-                   "3gp"
-                   "crdownload"
-                   "mp3")
-                  ((concat (my-guess-mplayer-path) "-fs -playlist") "list" "pls" "m3u")
-                  ((if *unix* "feh" "open") "gif" "jpeg" "jpg" "tif" "png" )
-                  ((if *unix* "libreoffice" "open") "doc" "docx" "xls" "xlsx" "odt")
-                  ("djview" "djvu")
-                  ("firefox" "xml" "xhtml" "html" "htm" "mht" "epub")))
-    (add-to-list 'dired-guess-shell-alist-user
-                 (list (concat "\\." (regexp-opt (cdr file) t) "$")
-                       (car file)))))
+  (my-dired-support-program (if *is-a-mac* "open" (my-guess-mplayer-path))
+                            (my-file-extensions-to-regexp my-media-file-extensions))
+
+  (my-dired-support-program (if *unix* "zathura" "open")
+                            (my-file-extensions-to-regexp '("pdf"
+                                                            "pdf.gz"
+                                                            "dvi"
+                                                            "eps"
+                                                            "ps")))
+
+  ;; "e" to extract, "x" to extract with full path
+  (my-dired-support-program "7z x"
+                            (my-file-extensions-to-regexp '("rar"
+                                                            "zip"
+                                                            "7z")))
+
+  (my-dired-support-program (if *unix* "feh" "open")
+                            (my-file-extensions-to-regexp '("gif"
+                                                            "jpg"
+                                                            "jpeg"
+                                                            "tif"
+                                                            "png"
+                                                            "svg"
+                                                            "xpm")))
+
+  (my-dired-support-program (if *unix* "libreoffice" "open")
+                            (my-file-extensions-to-regexp '("doc"
+                                                            "docx"
+                                                            "xls"
+                                                            "xlsx"
+                                                            "odt")))
+
+  (my-dired-support-program "djview" "\\.djvu$")
+
+  (my-dired-support-program "firefox"
+                            (my-file-extensions-to-regexp '("xml"
+                                                            "xhtml"
+                                                            "html"
+                                                            "htm"
+                                                            "mht"
+                                                            "epub"))))
 
 (defun dired-mode-hook-setup ()
   "Set up dired."
   (dired-hide-details-mode 1)
+  (local-set-key  "r" 'dired-up-directory)
   (local-set-key  "e" 'my-ediff-files)
   (local-set-key  "/" 'dired-isearch-filenames)
   (local-set-key  "\\" 'diredext-exec-git-command-in-shell))
@@ -83,6 +102,10 @@ If no files marked, always operate on current line in dired-mode."
   "Recent directories accessed by dired.")
 
 (with-eval-after-load 'dired
+  ;; re-use dired buffer, available in Emacs 28
+  ;; @see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20598
+  (setq dired-kill-when-opening-new-dired-buffer t)
+
   ;; search file name only when focus is over file
   (setq dired-isearch-filenames 'dwim)
 
@@ -158,7 +181,7 @@ If SEARCH-IN-DIR is t, try to find the subtitle by searching in directory."
     "Detect subtitles for mplayer."
     (let* ((rlt (apply orig-func args)))
       (when (and (stringp rlt)
-                 (string-match-p "^mplayer -quiet" rlt))
+                 (string-match-p "^mplayer .*-quiet" rlt))
         ;; append subtitle to mplayer cli
         (setq rlt
               (format "%s %s"
@@ -178,7 +201,7 @@ If SEARCH-IN-DIR is t, try to find the subtitle by searching in directory."
     "Avoid accidentally editing huge file in dired."
     (let* ((file (dired-get-file-for-visit)))
       (cond
-       ((string-match-p my-binary-file-name-regexp file)
+       ((my-binary-file-p file)
         ;; confirm before opening big file
         (when (yes-or-no-p "Edit binary file?")
           (apply orig-func args)))