Browse Source

Squashed 'emacs.d/' changes from 8e1af145..582f9aa4

582f9aa4 Bump version to 0.200.13
51de051d Remove ess-R-object-popup from ess layer.
185d4d1d Remove ess-R-object-popup from ess layer.
32923c3b Remove wolfram-mode package from extra-langs
401a07ed Import info+.el as local package
a26fb15b Import help-fns+.el as local package
af1be534 Import hide-comnt.el as local package
3b5339d9 core: fix not found packages with dotspacemacs-install-packages all
65f148b1 Bump version to 0.200.12
0d69757a Fix test test-resolve-package-archives--org-supports-https
3fa3997a core: Use https for org package repo
c25f1c6d Bump version to 0.200.11 Hotfix release
e6e73cb8 python: update invalid cython mode keybindings
096a9ea6 Fixed keybinding to helm-cscope-find-calling-this-function
08ec6ad2 Use helm-spotify-plus instead of helm-spotify
3ea3927d use org-mime provided by melpa
08df5f97 spacemacs-completion: comply w/ new helm-display-buffer signature
fe644131 core: update quelpa library
024a59dd python: update anaconda-mode view mode variable names
ec2c5e5c Backport up to date lists of themes
cc34356e Chinese layer: update package name due to upstream renaming
4bb4cb46 Bump version to 0.200.10 and update Change Log
7efa18db Fix window number assignation for Neotree buffer window
f6d4062f helm-bookmarks: don't change keys to early

git-subtree-dir: emacs.d
git-subtree-split: 582f9aa45c2c90bc6ec98bccda33fc428e4c6d48
master
Brett Langdon 8 years ago
parent
commit
44f2198d00
27 changed files with 8450 additions and 93 deletions
  1. +26
    -0
      CHANGELOG.org
  2. +11
    -14
      core/core-configuration-layer.el
  3. +1
    -1
      core/core-spacemacs-buffer.el
  4. +47
    -7
      core/core-themes-support.el
  5. +4
    -0
      core/info/release-notes/0.200.10.txt
  6. +11
    -0
      core/info/release-notes/0.200.11.txt
  7. +7
    -0
      core/info/release-notes/0.200.13.txt
  8. +34
    -20
      core/libs/quelpa.el
  9. +1
    -1
      init.el
  10. +2
    -2
      layers/+completion/helm/packages.el
  11. +2918
    -0
      layers/+distributions/spacemacs-base/local/help-fns+/help-fns+.el
  12. +1
    -1
      layers/+distributions/spacemacs-base/packages.el
  13. +1
    -2
      layers/+emacs/org/packages.el
  14. +6
    -8
      layers/+intl/chinese/packages.el
  15. +4
    -5
      layers/+lang/ess/README.org
  16. +0
    -4
      layers/+lang/ess/packages.el
  17. +3
    -1
      layers/+lang/extra-langs/packages.el
  18. +5
    -3
      layers/+lang/python/packages.el
  19. +1
    -1
      layers/+spacemacs/spacemacs-completion/funcs.el
  20. +312
    -0
      layers/+spacemacs/spacemacs-editing-visual/local/hide-comnt/hide-comnt.el
  21. +1
    -1
      layers/+spacemacs/spacemacs-editing-visual/packages.el
  22. +5040
    -0
      layers/+spacemacs/spacemacs-ui/local/info+/info+.el
  23. +2
    -2
      layers/+spacemacs/spacemacs-ui/packages.el
  24. +1
    -1
      layers/+tags/cscope/packages.el
  25. +5
    -7
      layers/+themes/themes-megapack/packages.el
  26. +4
    -4
      layers/+web-services/spotify/packages.el
  27. +2
    -8
      tests/core/core-configuration-layer-utest.el

+ 26
- 0
CHANGELOG.org View File

@ -1,4 +1,30 @@
* Release 0.200.x
** 0.200.13 (2018/01/25)
*** Fixes
- Remove =ess-R-object-popup= from =ess= layer (thanks to NGaffney)
- Remove =wolfram-mode= package from =extra-langs= (thanks to bennofs)
- Import =info+.el= as local package
- Import =help-fns+.el= as local package
- Import =hide-comnt.el= as local package
- core: fix not found packages with =dotspacemacs-install-packages= all
** 0.200.12 (2018/01/23)
*** Fixes
- Use HTTPS instead of HTTP for ORG ELPA repository (thanks to aaronjensen)
** 0.200.11 (2018/01/22)
*** Fixes
- Fix =helm= display function (thanks to jackkamm)
- Fix =anaconda-mode= variable names in Python layer (thanks to nixmaniack)
- Fix typo in =helm-cscope-find-calling-this-function= (thanks to dubnde)
- Use =org=mime= package from MELPA (thanks to jackkamm)
- Replace broken =helm-spotify= package by =helm-spotify-plus= (thanks to leezu)
- Update =Quelpa= library
- Backport up to date list of themes in core and themes-megapack layer.
- Fix =pyim= package name in Chinese layer (thanks to James Wang)
** 0.200.10 (2017/11/01)
*** Fixes
- Fix error: (void-variable helm-bookmark-map) when selecting a candidate from
a Helm buffer (thanks to bmag)
- Fix window number assignation for Neotree buffer window (thanks to duianto)
** 0.200.9 (2017/04/06)
*** Fixes
- Fix theme loading with terminal Emacs (thanks to wang0z)


+ 11
- 14
core/core-configuration-layer.el View File

@ -336,13 +336,7 @@ The returned list has a `package-archives' compliant format."
apath
(concat
(if (and dotspacemacs-elpa-https
(not spacemacs-insecure)
;; for now org ELPA repository does
;; not support HTTPS
;; TODO when org ELPA repo support
;; HTTPS remove the check
;; `(not (equal "org" aname))'
(not (equal "org" aname)))
(not spacemacs-insecure))
"https://"
"http://")
apath)))))
@ -1034,12 +1028,15 @@ return both used and unused packages."
packages
(lambda (x)
(let ((pkg (configuration-layer/get-package x)))
(and (not (memq (oref pkg :location) '(built-in site local)))
(not (stringp (oref pkg :location)))
(or (null usedp)
(and (not (null (oref pkg :owners)))
(not (oref pkg :excluded))
(cfgl-package-enabledp pkg t))))))))
(if pkg
(and (not (memq (oref pkg :location) '(built-in site local)))
(not (stringp (oref pkg :location)))
(or (null usedp)
(and (not (null (oref pkg :owners)))
(not (oref pkg :excluded))
(cfgl-package-enabledp pkg t))))
(spacemacs-buffer/warning "Cannot find package for %s" x)
nil)))))
(defun configuration-layer//get-private-layer-dir (name)
"Return an absolute path to the private configuration layer string NAME."
@ -2180,7 +2177,7 @@ Original code from dochang at https://github.com/dochang/elpa-clone"
(configuration-layer/make-all-packages 'no-discover)
(let (package-archive-contents
(package-archives '(("melpa" . "https://melpa.org/packages/")
("org" . "http://orgmode.org/elpa/")
("org" . "https://orgmode.org/elpa/")
("gnu" . "https://elpa.gnu.org/packages/"))))
(package-refresh-contents)
(package-read-all-archive-contents)


+ 1
- 1
core/core-spacemacs-buffer.el View File

@ -13,7 +13,7 @@
;;
;;; Code:
(defconst spacemacs-buffer-version-info "0.200.9"
(defconst spacemacs-buffer-version-info "0.200.13"
"Current version used to display addition release information.")
(defconst spacemacs-buffer-name "*spacemacs*"


+ 47
- 7
core/core-themes-support.el View File

@ -26,7 +26,7 @@
(defconst spacemacs-theme-name-to-package
'(
(alect-black-alt . alect-themes)
(alect-black-alt . alect-themes)
(alect-black . alect-themes)
(alect-dark-alt . alect-themes)
(alect-dark . alect-themes)
@ -62,9 +62,15 @@
(base16-bespin . base16-theme)
(base16-brewer . base16-theme)
(base16-bright . base16-theme)
(base16-brushtrees . base16-theme)
(base16-brushtrees-dark . base16-theme)
(base16-chalk . base16-theme)
(base16-circus . base16-theme)
(base16-classic-dark . base16-theme)
(base16-classic-light . base16-theme)
(base16-codeschool . base16-theme)
(base16-cupcake . base16-theme)
(base16-cupertino . base16-theme)
(base16-darktooth . base16-theme)
(base16-default-dark . base16-theme)
(base16-default-light . base16-theme)
@ -77,32 +83,47 @@
(base16-google-light . base16-theme)
(base16-grayscale-dark . base16-theme)
(base16-grayscale-light . base16-theme)
(base16-green-screen . base16-theme)
(base16-harmonic16-dark . base16-theme)
(base16-harmonic16-light . base16-theme)
(base16-greenscreen . base16-theme)
(base16-gruvbox-dark-hard . base16-theme)
(base16-gruvbox-dark-medium . base16-theme)
(base16-gruvbox-dark-pale . base16-theme)
(base16-gruvbox-dark-soft . base16-theme)
(base16-gruvbox-light-hard . base16-theme)
(base16-gruvbox-light-medium . base16-theme)
(base16-gruvbox-light-soft . base16-theme)
(base16-harmonic-dark . base16-theme)
(base16-harmonic-light . base16-theme)
(base16-hopscotch . base16-theme)
(base16-ir-black . base16-theme)
(base16-irblack . base16-theme)
(base16-isotope . base16-theme)
(base16-london-tube . base16-theme)
(base16-macintosh . base16-theme)
(base16-marrakesh . base16-theme)
(base16-materia . base16-theme)
(base16-material-darker . base16-theme)
(base16-material-lighter . base16-theme)
(base16-material-palenight . base16-theme)
(base16-material . base16-theme)
(base16-mellow-purple . base16-theme)
(base16-mexico-light . base16-theme)
(base16-mocha . base16-theme)
(base16-monokai . base16-theme)
(base16-nord . base16-theme)
(base16-ocean . base16-theme)
(base16-oceanicnext . base16-theme)
(base16-onedark . base16-theme)
(base16-one-light . base16-theme)
(base16-paraiso . base16-theme)
(base16-phd . base16-theme)
(base16-pico . base16-theme)
(base16-pop . base16-theme)
(base16-porple . base16-theme)
(base16-railscasts . base16-theme)
(base16-rebecca . base16-theme)
(base16-seti . base16-theme)
(base16-seti-ui . base16-theme)
(base16-shapeshifter . base16-theme)
(base16-solar-flare . base16-theme)
(base16-solarflare . base16-theme)
(base16-solarized-dark . base16-theme)
(base16-solarized-light . base16-theme)
(base16-spacemacs . base16-theme)
@ -115,6 +136,8 @@
(base16-unikitty-dark . base16-theme)
(base16-unikitty-light . base16-theme)
(base16-woodland . base16-theme)
(base16-xcode-dusk . base16-theme)
(base16-zenburn . base16-theme)
(sanityinc-solarized-dark . color-theme-sanityinc-solarized)
(sanityinc-solarized-light . color-theme-sanityinc-solarized)
(sanityinc-tomorrow-blue . color-theme-sanityinc-tomorrow)
@ -122,8 +145,19 @@
(sanityinc-tomorrow-day . color-theme-sanityinc-tomorrow)
(sanityinc-tomorrow-eighties . color-theme-sanityinc-tomorrow)
(sanityinc-tomorrow-night . color-theme-sanityinc-tomorrow)
(doom-one . doom-themes)
(doom-molokai . doom-themes)
(doom-mono-dark . doom-themes)
(doom-mono-light . doom-themes)
(doom-nova . doom-themes)
(doom-one . doom-themes)
(doom-one-light . doom-themes)
(doom-peacock . doom-themes)
(doom-spacegrey . doom-themes)
(doom-tomorrow-day . doom-themes)
(doom-tomorrow-night . doom-themes)
(doom-tron . doom-themes)
(doom-vibrant . doom-themes)
(doom-x . doom-themes)
(solarized-light . solarized-theme)
(solarized-dark . solarized-theme)
(spacemacs-light . spacemacs-theme)
@ -160,6 +194,12 @@
(tao-yang . tao-theme)
(farmhouse-light . farmhouse-theme)
(farmhouse-dark . farmhouse-theme)
(gruvbox-dark-soft . gruvbox-theme)
(gruvbox-dark-medium . gruvbox-theme)
(gruvbox-dark-hard . gruvbox-theme)
(gruvbox-light-soft . gruvbox-theme)
(gruvbox-light-medium . gruvbox-theme)
(gruvbox-light-hard . gruvbox-theme)
)
"alist matching a theme name with its package name, required when
package name does not match theme name + `-theme' suffix.")


+ 4
- 0
core/info/release-notes/0.200.10.txt View File

@ -0,0 +1,4 @@
HOT FIX RELEASE
- Fix Helm error when selecting a candidate from a Helm buffer (thanks to bmag)
- Fix window number assignation for Neotree buffer window (thanks to duianto)

+ 11
- 0
core/info/release-notes/0.200.11.txt View File

@ -0,0 +1,11 @@
HOT FIX RELEASE
- Use HTTPS instead of HTTP for ORG ELPA repository (thanks to aaronjensen)
- Fix =helm= display function (thanks to jackkamm)
- Fix =anaconda-mode= variable names in Python layer (thanks to nixmaniack)
- Fix typo in =helm-cscope-find-calling-this-function= (thanks to dubnde)
- Use =org=mime= package from MELPA (thanks to jackkamm)
- Replace broken =helm-spotify= package by =helm-spotify-plus= (thanks to leezu)
- Update =Quelpa= library
- Backport up to date list of themes in core and themes-megapack layer.
- Fix =pyim= package name in Chinese layer (thanks to James Wang)

+ 7
- 0
core/info/release-notes/0.200.13.txt View File

@ -0,0 +1,7 @@
MELPA HOT FIX RELEASE
- Fixes removed packages from MELPA.
Essentially Emacs WIKI packages are concerned. They have been imported as local
packages from Emacsmirror GitHub organization (thanks to tarsius for maintaining
it)

+ 34
- 20
core/libs/quelpa.el View File

@ -1,6 +1,6 @@
;;; quelpa.el --- Emacs Lisp packages built directly from source
;; Copyright 2014-2015, Steckerhalter
;; Copyright 2014-2017, Steckerhalter
;; Copyright 2014-2015, Vasilij Schneidermann <v.schneidermann@gmail.com>
;; Author: steckerhalter
@ -139,6 +139,13 @@ If nil the update is disabled and the repo is only updated on
:group 'quelpa
:type 'string)
(defcustom quelpa-self-upgrade-p t
"If non-nil upgrade quelpa itself when doing a
`quelpa-upgrade', otherwise only upgrade the packages in the
quelpa cache."
:group 'quelpa
:type 'boolean)
(defvar quelpa-initialized-p nil
"Non-nil when quelpa has been initialized.")
@ -241,15 +248,18 @@ Return nil if the package is already installed and should not be upgraded."
(unless (or (and (assq name package-alist) (not quelpa-upgrade-p))
(and (not config)
(quelpa-message t "no recipe found for package `%s'" name)))
(let ((version (condition-case err
(package-build-checkout name config dir)
(error (quelpa-message t
"failed to checkout `%s': `%s'"
name
(error-message-string err))
nil))))
(when (quelpa-version>-p name version)
version)))))
(if (member (plist-get config :fetcher) '(wiki bzr cvs darcs fossil svn))
(user-error
"The `%s' fetcher is not supported anymore.
It has been removed from the `package-build' library: cannot install `%s'"
(plist-get config :fetcher)
name)
(let ((version (condition-case err
(package-build-checkout name config dir)
(error "failed to checkout `%s': `%s'"
name (error-message-string err)))))
(when (quelpa-version>-p name version)
version))))))
(defun quelpa-build-package (rcp)
"Build a package from the given recipe RCP.
@ -342,7 +352,7 @@ and return TIME-STAMP, otherwise return OLD-TIME-STAMP."
new-stamp-info
new-content-hash
(time-stamp
(replace-regexp-in-string "\\.0" "." (format-time-string "%Y%m%d.%H%M%S")))
(replace-regexp-in-string "\\.0+" "." (format-time-string "%Y%m%d.%H%M%S")))
(stamp-file (concat (expand-file-name (symbol-name name) dir) ".stamp"))
(old-stamp-info (package-build--read-from-file stamp-file))
(old-content-hash (cdr old-stamp-info))
@ -351,7 +361,7 @@ and return TIME-STAMP, otherwise return OLD-TIME-STAMP."
(version (plist-get config :version)))
(if (not (file-exists-p file-path))
(error (quelpa-message t "`%s' does not exist" file-path))
(error "`%s' does not exist" file-path)
(if (eq type 'directory)
(setq files (quelpa-expand-source-file-list file-path config)
hashes (mapcar
@ -412,7 +422,7 @@ attribute with an URL like \"http://domain.tld/path/to/file.el\"."
(local-path (expand-file-name remote-file-name dir))
(mm-attachment-file-modes (default-file-modes)))
(unless (string= (file-name-extension url) "el")
(error (quelpa-message t "<%s> does not end in .el" url)))
(error "<%s> does not end in .el" url))
(unless (file-directory-p dir)
(make-directory dir))
(url-copy-file url local-path t)
@ -476,8 +486,7 @@ If there is an error and no existing checkout return nil."
'package-build
`(:url ,quelpa-melpa-repo-url :files ("*"))
quelpa-melpa-dir)
(error (quelpa-message t "failed to checkout melpa git repo: `%s'" (error-message-string err))
(file-exists-p (expand-file-name ".git" quelpa-melpa-dir))))))
(error "failed to checkout melpa git repo: `%s'" (error-message-string err)))))
(defun quelpa-get-melpa-recipe (name)
"Read recipe with NAME for melpa git checkout.
@ -570,7 +579,8 @@ install them."
(requires (package-desc-reqs pkg-desc)))
(when requires
(mapc (lambda (req)
(unless (equal 'emacs (car req))
(unless (or (equal 'emacs (car req))
(package-installed-p (car req) (cadr req)))
(quelpa-package-install (car req))))
requires))
(quelpa-package-install-file file)))))
@ -578,10 +588,13 @@ install them."
(defun quelpa-interactive-candidate ()
"Query the user for a recipe and return the name."
(when (quelpa-setup-p)
(let ((recipes (directory-files
(expand-file-name "recipes" quelpa-melpa-dir)
(let ((recipes (cl-loop
for store in quelpa-melpa-recipe-stores
if (stringp store)
;; this regexp matches all files except dotfiles
nil "^[^.].+$")))
append (directory-files store nil "^[^.].+$")
else if (listp store)
append store)))
(intern (completing-read "Choose MELPA recipe: "
recipes nil t)))))
@ -616,7 +629,8 @@ the `quelpa' command has been run in the current Emacs session."
(interactive)
(when (quelpa-setup-p)
(let ((quelpa-upgrade-p t))
(quelpa-self-upgrade)
(when quelpa-self-upgrade-p
(quelpa-self-upgrade))
(setq quelpa-cache
(cl-remove-if-not #'package-installed-p quelpa-cache :key #'car))
(mapc (lambda (item)


+ 1
- 1
init.el View File

@ -16,7 +16,7 @@
;; lower value in your dotfile (function `dotspacemacs/user-config')
(setq gc-cons-threshold 100000000)
(defconst spacemacs-version "0.200.9" "Spacemacs version.")
(defconst spacemacs-version "0.200.13" "Spacemacs version.")
(defconst spacemacs-emacs-min-version "24.4" "Minimal version of Emacs.")
(if (not (version<= spacemacs-emacs-min-version emacs-version))


+ 2
- 2
layers/+completion/helm/packages.el View File

@ -127,7 +127,6 @@
(helm-locate-set-command)
(setq helm-locate-fuzzy-match (string-match "locate" helm-locate-command))
;; alter helm-bookmark key bindings to be simpler
;; TODO check if there is a more elegant solution to setup these bindings
(defun simpler-helm-bookmark-keybindings ()
(define-key helm-bookmark-map (kbd "C-d") 'helm-bookmark-run-delete)
(define-key helm-bookmark-map (kbd "C-e") 'helm-bookmark-run-edit)
@ -136,7 +135,8 @@
(define-key helm-bookmark-map
(kbd "C-o") 'helm-bookmark-run-jump-other-window)
(define-key helm-bookmark-map (kbd "C-/") 'helm-bookmark-help))
(add-hook 'helm-mode-hook 'simpler-helm-bookmark-keybindings)
(with-eval-after-load 'helm-bookmark
(simpler-helm-bookmark-keybindings))
(with-eval-after-load 'helm-mode ; required
(spacemacs|hide-lighter helm-mode)))))


+ 2918
- 0
layers/+distributions/spacemacs-base/local/help-fns+/help-fns+.el
File diff suppressed because it is too large
View File


+ 1
- 1
layers/+distributions/spacemacs-base/packages.el View File

@ -28,7 +28,7 @@
;; some packages need to look for binaries,
;; which means the path must be ready by then
(exec-path-from-shell :step pre)
help-fns+
(help-fns+ :location local)
(hi-lock :location built-in)
(holy-mode :location local :step pre)
(hybrid-mode :location local :step pre)


+ 1
- 2
layers/+emacs/org/packages.el View File

@ -24,8 +24,7 @@
(org :location built-in)
(org-agenda :location built-in)
org-download
;; org-mime is installed by `org-plus-contrib'
(org-mime :location built-in)
org-mime
org-pomodoro
org-present
(org-projectile :toggle (configuration-layer/package-usedp 'projectile))


+ 6
- 8
layers/+intl/chinese/packages.el View File

@ -13,7 +13,7 @@
;; which require an initialization must be listed explicitly in the list.
(setq chinese-packages
'(
(chinese-pyim :toggle (eq chinese-default-input-method 'pinyin))
(pyim :toggle (eq chinese-default-input-method 'pinyin))
(chinese-wbim :toggle (eq chinese-default-input-method 'wubi))
(fcitx :toggle chinese-enable-fcitx)
find-by-pinyin-dired
@ -59,18 +59,16 @@
;; Enable Chinese word segmentation support
youdao-dictionary-use-chinese-word-segmentation t))))
(defun chinese/init-chinese-pyim ()
(use-package chinese-pyim
(defun chinese/init-pyim ()
(use-package pyim
:if (eq 'pinyin chinese-default-input-method)
:init
(progn
(setq pyim-use-tooltip t
(setq pyim-page-tooltip t
pyim-directory (expand-file-name "pyim/" spacemacs-cache-directory)
pyim-dicts-directory (expand-file-name "dicts/" pyim-directory)
pyim-dcache-directory (expand-file-name "dcache/" pyim-directory)
pyim-personal-file (expand-file-name "pyim-personal.txt" pyim-directory)
default-input-method "chinese-pyim")
(evilified-state-evilify pyim-dicts-manager-mode pyim-dicts-manager-mode-map))))
default-input-method "pyim")
(evilified-state-evilify pyim-dm-mode pyim-dm-mode-map))))
(defun chinese/init-find-by-pinyin-dired ()
(use-package find-by-pinyin-dired


+ 4
- 5
layers/+lang/ess/README.org View File

@ -44,11 +44,10 @@ Send code to inferior process with these commands:
** Helpers
Helpers for inspecting objects at point are available in R buffers only.
| Key Binding | Description |
|-------------+---------------------------------------------------------------------|
| ~SPC m h d~ | view data under point using [ess-R-data-view][ess-R-data-view] |
| ~SPC m h i~ | object introspection popup [ess-R-object-popup][ess-R-object-popup] |
| ~SPC m h t~ | view table using [ess-R-data-view][ess-R-data-view] |
| Key Binding | Description |
|-------------+----------------------------------------------------------------|
| ~SPC m h d~ | view data under point using [ess-R-data-view][ess-R-data-view] |
| ~SPC m h t~ | view table using [ess-R-data-view][ess-R-data-view] |
* Options
=ess-smart-equals= is disabled by default. In order to enable it, set in your


+ 0
- 4
layers/+lang/ess/packages.el View File

@ -13,7 +13,6 @@
'(
ess
ess-R-data-view
ess-R-object-popup
ess-smart-equals
golden-ratio
org))
@ -104,7 +103,6 @@
"st" 'ess-eval-function
;; R helpers
"hd" 'ess-R-dv-pprint
"hi" 'ess-R-object-popup
"ht" 'ess-R-dv-ctable
)
(define-key ess-mode-map (kbd "<s-return>") 'ess-eval-line)
@ -113,8 +111,6 @@
(defun ess/init-ess-R-data-view ())
(defun ess/init-ess-R-object-popup ())
(defun ess/init-ess-smart-equals ()
(use-package ess-smart-equals
:defer t


+ 3
- 1
layers/+lang/extra-langs/packages.el View File

@ -7,7 +7,9 @@
scad-mode
stan-mode
thrift
wolfram-mode
;; removed from MELPA (https://github.com/syl20bnr/spacemacs/issues/9795)
;; TODO re-enable this mode when it is added back to MELPA
;; wolfram-mode
))
(defun extra-langs/init-arduino-mode ()


+ 5
- 3
layers/+lang/python/packages.el View File

@ -57,8 +57,10 @@
"ga" 'anaconda-mode-find-assignments
"gb" 'anaconda-mode-go-back
"gu" 'anaconda-mode-find-references)
(evilified-state-evilify anaconda-mode-view-mode anaconda-mode-view-mode-map
(evilified-state-evilify anaconda-view-mode anaconda-view-mode-map
(kbd "q") 'quit-window)
(spacemacs|hide-lighter anaconda-mode)
(defadvice anaconda-mode-goto (before python/anaconda-mode-goto activate)
@ -84,8 +86,8 @@
:init
(progn
(spacemacs/set-leader-keys-for-major-mode 'cython-mode
"hh" 'anaconda-mode-view-doc
"gu" 'anaconda-mode-usages))))
"hh" 'anaconda-mode-show-doc
"gu" 'anaconda-mode-find-references))))
(defun python/post-init-eldoc ()
(defun spacemacs//init-eldoc-python-mode ()


+ 1
- 1
layers/+spacemacs/spacemacs-completion/funcs.el View File

@ -112,7 +112,7 @@
(window-height . 0.4)))
(defvar spacemacs-display-buffer-alist nil)
(defun spacemacs//display-helm-window (buffer)
(defun spacemacs//display-helm-window (buffer &optional resume)
"Display the Helm window respecting `dotspacemacs-helm-position'."
(let ((display-buffer-alist
(list spacemacs-helm-display-help-buffer-regexp


+ 312
- 0
layers/+spacemacs/spacemacs-editing-visual/local/hide-comnt/hide-comnt.el View File

@ -0,0 +1,312 @@
;;; hide-comnt.el --- Hide/show comments in code.
;;
;; Filename: hide-comnt.el
;; Description: Hide/show comments in code.
;; Author: Drew Adams
;; Maintainer: Drew Adams (concat "drew.adams" "@" "oracle" ".com")
;; Copyright (C) 2011-2017, Drew Adams, all rights reserved.
;; Created: Wed May 11 07:11:30 2011 (-0700)
;; Version: 0
;; Package-Requires: ()
;; Last-Updated: Thu Feb 23 07:40:11 2017 (-0800)
;; By: dradams
;; Update #: 228
;; URL: https://www.emacswiki.org/emacs/download/hide-comnt.el
;; Doc URL: http://www.emacswiki.org/HideOrIgnoreComments
;; Keywords: comment, hide, show
;; Compatibility: GNU Emacs: 20.x, 21.x, 22.x, 23.x, 24.x, 25.x
;;
;; Features that might be required by this library:
;;
;; None
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;;; Commentary:
;;
;; Hide/show comments in code.
;;
;; Comments are hidden by giving them and `invisible' property of
;; value `hide-comment'.
;;
;;
;; Macros defined here:
;;
;; `with-comments-hidden'.
;;
;; Commands defined here:
;;
;; `hide/show-comments', `hide/show-comments-toggle'.
;;
;; User options defined here:
;;
;; `hide-whitespace-before-comment-flag', `ignore-comments-flag',
;; `show-invisible-comments-shows-all'.
;;
;; Non-interactive functions defined here:
;;
;; `hide/show-comments-1'.
;;
;;
;; Put this in your init file (`~/.emacs'):
;;
;; (require 'hide-comnt)
;;
;;
;; Note for Emacs 20: The commands and option defined here DO NOTHING
;; IN EMACS 20. Nevertheless, the library can be byte-compiled in
;; Emacs 20 and `hide-comnt.elc' can be loaded in later Emacs
;; versions and used there. This is the only real use of this
;; library for Emacs 20: it provides macro `with-comments-hidden'.
;;
;; Note for Emacs 21: It lacks the `comment-forward' function, so we
;; rely on the `comment-end' variable to determine the end of a
;; comment. This means that only one type of comment terminator is
;; supported. For example, `c++-mode' sets `comment-end' to "",
;; which is the convention for single-line comments ("// COMMENT").
;; So "/* */" comments are treated as single-line commentsonly the
;; first line of such comments is hidden. The "*/" terminator is not
;; taken into account.
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;;; Change Log:
;;
;; 2017/01/16 dadams
;; hide/show-comments-1: ((add-to|remove-from)-invisibility-spec 'hide-comment).
;; See https://github.com/syl20bnr/spacemacs/issues/8123.
;; 2016/12/27 dadams
;; Added: show-invisible-comments-shows-all.
;; hide/show-comments(-1): Respect show-invisible-comments-shows-all.
;; NOTE: Default behavior has changed: other invisible text is no longer made visible.
;; 2015/08/01 dadams
;; Added hide/show-comments-1. (And removed save-excursion around looking-back etc.)
;; hide/show-comments:
;; Use with-silent-modifications if available. Use hide/show-comments-1.
;; 2015/07/31 dadams
;; hide/show-comments:
;; Bind buffer-file-name to nil to inhibit ask-user-about-supersession-threat.
;; 2015/07/29 dadams
;; hide/show-comments:
;; No-op if no comment-start. Pass NOERROR arg to comment-normalize-vars.
;; 2014/11/05 dadams
;; hide/show-comments:
;; Use comment-forward even for "", so handle setting CEND correctly, e.g., for C++,
;; where comment-end is "" but multi-line comments are also OK.
;; Do not hide newline after single-line comments.
;; hide-whitespace-before-comment-flag non-nil no longer hides empty lines.
;; Prevent infloop for comment at bol.
;; Thx to Hinrik Sigurosson.
;; 2014/02/06 dadams
;; Added: hide-whitespace-before-comment-flag.
;; hide/show-comments:
;; Go to start of comment before calling comment-forward.
;; Hide whitespace preceding comment, if hide-whitespace-before-comment-flag.
;; 2013/12/26 dadams
;; hide/show-comments: Update START to comment end or END.
;; 2013/10/09 dadams
;; hide/show-comments: Use save-excursion. If empty comment-end go to CBEG.
;; Use comment-forward if available.
;; 2012/10/06 dadams
;; hide/show-comments: Call comment-normalize-vars first. Thx to Stefan Monnier.
;; hide/show-comments-toggle: Do nothing if newcomment.el not available.
;; 2012/05/10 dadams
;; Added: hide/show-comments-toggle. Thx to Denny Zhang for the suggestion.
;; 2011/11/23 dadams
;; hide/show-comments: Bug fix - ensure CEND is not past eob.
;; 2011/05/11 dadams
;; Created: moved code here from thing-cmds.el.
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; 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 3, 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:
(defvar comment-start) ; In `newcomment.el'.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;###autoload
(defcustom ignore-comments-flag t
"*Non-nil means macro `with-comments-hidden' hides comments."
:type 'boolean :group 'matching)
;;;###autoload
(defcustom hide-whitespace-before-comment-flag t
"*Non-nil means `hide/show-comments' hides whitespace preceding a comment.
It does not hide empty lines (newline chars), however."
:type 'boolean :group 'matching)
;;;###autoload
(defcustom show-invisible-comments-shows-all nil
"Non-nil means `(hide/show-comments 'show ...)' shows all invisible text.
The default value, nil, means it shows only text that was made
invisible by `(hide/show-comments 'hide ...)'."
:type 'boolean :group 'matching)
(defmacro with-comments-hidden (start end &rest body)
"Evaluate the forms in BODY while comments are hidden from START to END.
But if `ignore-comments-flag' is nil, just evaluate BODY,
without hiding comments. Show comments again when BODY is finished.
See `hide/show-comments', which is used to hide and show the comments.
Note that prior to Emacs 21, this never hides comments."
(let ((result (make-symbol "result"))
(ostart (make-symbol "ostart"))
(oend (make-symbol "oend")))
`(let ((,ostart ,start)
(,oend ,end)
,result)
(unwind-protect (setq ,result (progn (when ignore-comments-flag
(hide/show-comments 'hide ,ostart ,oend))
,@body))
(when ignore-comments-flag (hide/show-comments 'show ,ostart ,oend))
,result))))
;;;###autoload
(defun hide/show-comments (&optional hide/show start end)
"Hide or show comments from START to END.
Interactively, hide comments, or show them if you use a prefix arg.
\(This is thus *NOT* a toggle command.)
If option `hide-whitespace-before-comment-flag' is non-nil, then hide
also any whitespace preceding a comment.
Interactively, START and END default to the region limits, if active.
Otherwise, including non-interactively, they default to `point-min'
and `point-max'.
Uses `save-excursion', restoring point.
Option `show-invisible-comments-shows-all':
* If non-nil then using this command to show invisible text shows
*ALL* such text, regardless of how it was hidden. IOW, it does not
just show invisible text that you previously hid using this command.
* If nil (the default value) then using this command to show invisible
text makes visible only such text that was previously hidden by this
command. (More precisely, it makes visible only text whose
`invisible' property has value `hide-comment'.)
From Lisp, a HIDE/SHOW value of `hide' hides comments. Other values
show them.
This command does nothing in Emacs versions prior to Emacs 21, because
it needs `comment-search-forward'."
(interactive
(cons (if current-prefix-arg 'show 'hide)
(if (or (not mark-active) (null (mark)) (= (point) (mark)))
(list (point-min) (point-max))
(if (< (point) (mark)) (list (point) (mark)) (list (mark) (point))))))
(when (and comment-start ; No-op if no comment syntax defined.
(require 'newcomment nil t)) ; `comment-search-forward', Emacs 21+.
(comment-normalize-vars 'NO-ERROR) ; Must call this first.
(unless start (setq start (point-min)))
(unless end (setq end (point-max)))
(unless (<= start end) (setq start (prog1 end (setq end start)))) ; Swap.
(if (fboundp 'with-silent-modifications)
(with-silent-modifications ; Emacs 23+.
(restore-buffer-modified-p nil) (hide/show-comments-1 hide/show start end))
(let ((bufmodp (buffer-modified-p)) ; Emacs < 23.
(buffer-read-only nil)
(buffer-file-name nil)) ; Inhibit `ask-user-about-supersession-threat'.
(set-buffer-modified-p nil)
(unwind-protect (hide/show-comments-1 hide/show start end)
(set-buffer-modified-p bufmodp))))))
;; Used only so that we can use `hide/show-comments' with older Emacs releases that do not
;; have macro `with-silent-modifications' and built-in `restore-buffer-modified-p', which
;; it uses.
(defun hide/show-comments-1 (hide/show start end)
"Helper for `hide/show-comments'."
(let (cbeg cend)
(if (eq 'hide hide/show)
(add-to-invisibility-spec 'hide-comment)
(remove-from-invisibility-spec 'hide-comment))
(save-excursion
(goto-char start)
(while (and (< start end) (save-excursion
(setq cbeg (comment-search-forward end 'NOERROR))))
(goto-char cbeg)
(save-excursion
(setq cend (cond ((fboundp 'comment-forward) ; Emacs 22+
(if (comment-forward 1)
(if (= (char-before) ?\n) (1- (point)) (point))
end))
((string= "" comment-end) (min (line-end-position) end))
(t (search-forward comment-end end 'NOERROR)))))
(when hide-whitespace-before-comment-flag ; Hide preceding whitespace.
(if (fboundp 'looking-back) ; Emacs 22+
(when (looking-back "\n?\\s-*" nil 'GREEDY)
(setq cbeg (match-beginning 0)))
(while (memq (char-before cbeg) '(?\ ?\t ?\f)) (setq cbeg (1- cbeg)))
(when (eq (char-before cbeg) ?\n) (setq cbeg (1- cbeg))))
;; First line: Hide newline after comment.
(when (and (= cbeg (point-min)) (= (char-after cend) ?\n))
(setq cend (min (1+ cend) end))))
(when (and cbeg cend)
(if show-invisible-comments-shows-all
(put-text-property cbeg cend 'invisible (and (eq 'hide hide/show)
'hide-comment))
(while (< cbeg cend)
;; Do nothing to text that is already invisible for some other reason.
(unless (and (get-text-property cbeg 'invisible)
(not (eq 'hide-comment (get-text-property cbeg 'invisible))))
(put-text-property cbeg (1+ cbeg) 'invisible (and (eq 'hide hide/show)
'hide-comment)))
(setq cbeg (1+ cbeg)))))
(goto-char (setq start (or cend end)))))))
(defun hide/show-comments-toggle (&optional start end)
"Toggle hiding/showing of comments in the active region or whole buffer.
If the region is active then toggle in the region. Otherwise, in the
whole buffer.
This command does nothing in Emacs versions prior to Emacs 21, because
it needs `comment-search-forward'.
Interactively, START and END default to the region limits, if active.
Otherwise, including non-interactively, they default to `point-min'
and `point-max'.
See `hide/show-comments' for more information."
(interactive (if (or (not mark-active) (null (mark)) (= (point) (mark)))
(list (point-min) (point-max))
(if (< (point) (mark)) (list (point) (mark)) (list (mark) (point)))))
(when (require 'newcomment nil t) ; `comment-search-forward', Emacs 21+.
(comment-normalize-vars) ; Must call this first.
(if (save-excursion
(goto-char start)
(and (comment-search-forward end 'NOERROR)
(if show-invisible-comments-shows-all
(get-text-property (point) 'invisible)
(eq 'hide-comment (get-text-property (point) 'invisible)))))
(hide/show-comments 'show start end)
(hide/show-comments 'hide start end))))
;;;;;;;;;;;;;;;;;;;;;;;;
(provide 'hide-comnt)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; hide-comnt.el ends here

+ 1
- 1
layers/+spacemacs/spacemacs-editing-visual/packages.el View File

@ -15,7 +15,7 @@
adaptive-wrap
auto-highlight-symbol
column-enforce-mode
hide-comnt
(hide-comnt :location local)
highlight-indentation
highlight-numbers
highlight-parentheses


+ 5040
- 0
layers/+spacemacs/spacemacs-ui/local/info+/info+.el
File diff suppressed because it is too large
View File


+ 2
- 2
layers/+spacemacs/spacemacs-ui/packages.el View File

@ -15,7 +15,7 @@
desktop
(doc-view :location built-in)
flx-ido
info+
(info+ :location local)
open-junk-file
paradox
restart-emacs
@ -281,8 +281,8 @@ debug-init and load the given list of packages."
;; assigning 0 only to the top-left window
(eq (selected-window) (frame-first-window)))
0))
(add-to-list 'winum-assign-functions #'spacemacs//winum-assign-func)
(setq winum-auto-assign-0-to-minibuffer nil
winum-assign-func 'spacemacs//winum-assign-func
winum-auto-setup-mode-line nil
winum-ignored-buffers '(" *which-key*"))
(spacemacs/set-leader-keys


+ 1
- 1
layers/+tags/cscope/packages.el View File

@ -48,7 +48,7 @@
"Setup `helm-cscope' for MODE"
(spacemacs/set-leader-keys-for-major-mode mode
"gc" 'helm-cscope-find-called-function
"gC" 'helm-cscope-find-calling-this-funtcion
"gC" 'helm-cscope-find-calling-this-function
"gd" 'helm-cscope-find-global-definition
"ge" 'helm-cscope-find-egrep-pattern
"gf" 'helm-cscope-find-this-file


+ 5
- 7
layers/+themes/themes-megapack/packages.el View File

@ -18,7 +18,7 @@
apropospriate-theme
anti-zenburn-theme
;; contains errors
; badger-theme
;; badger-theme
badwolf-theme
birds-of-paradise-plus-theme
bubbleberry-theme
@ -36,8 +36,8 @@
django-theme
dracula-theme
espresso-theme
exotica-theme
farmhouse-theme
firebelly-theme
flatland-theme
flatui-theme
gandalf-theme
@ -64,20 +64,19 @@
monochrome-theme
mustang-theme
naquadah-theme
niflheim-theme
noctilux-theme
obsidian-theme
occidental-theme
omtose-phellack-theme
oldlace-theme
organic-green-theme
pastels-on-dark-theme
phoenix-dark-mono-theme
phoenix-dark-pink-theme
planet-theme
professional-theme
purple-haze-theme
railscasts-theme
rebecca-theme
reverse-theme
seti-theme
smyx-theme
@ -96,17 +95,16 @@
tangotango-theme
tao-theme
;; contains error
; tommyh-theme
;; tommyh-theme
toxi-theme
tronesque-theme
twilight-anti-bright-theme
twilight-bright-theme
twilight-theme
ujelly-theme
underwater-theme
white-sand-theme
zen-and-art-theme
zenburn-theme
zonokai-theme
))
;; define programmatically the init functions


+ 4
- 4
layers/+web-services/spotify/packages.el View File

@ -12,7 +12,7 @@
(setq spotify-packages
'(
spotify
(helm-spotify :toggle (configuration-layer/package-usedp 'helm))
(helm-spotify-plus :toggle (configuration-layer/package-usedp 'helm))
))
(defun spotify/init-spotify ()
@ -28,7 +28,7 @@
"amsN" 'spotify-previous
"amsQ" 'spotify-quit))))
(defun spotify/init-helm-spotify ()
(use-package helm-spotify
(defun spotify/init-helm-spotify-plus ()
(use-package helm-spotify-plus
:defer t
:init (spacemacs/set-leader-keys "amsg" 'helm-spotify)))
:init (spacemacs/set-leader-keys "amsg" 'helm-spotify-plus)))

+ 2
- 8
tests/core/core-configuration-layer-utest.el View File

@ -289,16 +289,10 @@
(should (equal '(("melpa" . "http://melpa.org/packages/"))
(configuration-layer//resolve-package-archives input)))))
(ert-deftest test-resolve-package-archives--org-supports-http ()
(let ((input '(("org" . "orgmode.org/elpa/")))
dotspacemacs-elpa-https)
(should (equal '(("org" . "http://orgmode.org/elpa/"))
(configuration-layer//resolve-package-archives input)))))
(ert-deftest test-resolve-package-archives--org-does-not-support-https ()
(ert-deftest test-resolve-package-archives--org-supports-https ()
(let ((input '(("org" . "orgmode.org/elpa/")))
(dotspacemacs-elpa-https t))
(should (equal '(("org" . "http://orgmode.org/elpa/"))
(should (equal '(("org" . "https://orgmode.org/elpa/"))
(configuration-layer//resolve-package-archives input)))))
(ert-deftest test-resolve-package-archives--idempotent-when-already-http-prefix ()


Loading…
Cancel
Save