Skip to content

Commit

Permalink
dsm-vars: fix docstrings and comments, better consistency
Browse files Browse the repository at this point in the history
Add `(default X)` comment to almost all dotspacemacs variables in
dotspacemacs/init function in the template. Exempted are variables with long
default values. (e.g. dotspacemacs-themes)

Remove `(default X)` from doctsring of dotspacemacs variables. It isn't
necessary, the built-in help system already displays the default value
automatically.

Fix some minor grammar and spelling mistakes.
  • Loading branch information
bmag committed Aug 9, 2017
1 parent c6afc2a commit 0fb17fa
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
11 changes: 5 additions & 6 deletions core/core-dotspacemacs.el
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,11 @@ no major mode or minor modes are active.")
(defvar dotspacemacs-auto-save-file-location 'cache
"Location where to auto-save files. Possible values are `original' to
auto-save the file in-place, `cache' to auto-save the file to another
file stored in the cache directory and `nil' to disable auto-saving.
Default value is `cache'.")
file stored in the cache directory and `nil' to disable auto-saving.")

(defvar dotspacemacs-enable-paste-transient-state nil
"If non-nil, the paste transient-state is enabled. And pressing `p' several
times, cycles through the elements in the `kill-ring'. (default nil)")
"If non-nil, the paste transient-state is enabled. While enabled, pressing
`p' several times cycles through the elements in the `kill-ring'.")
(defvaralias
'dotspacemacs-enable-paste-micro-state
'dotspacemacs-enable-paste-transient-state
Expand Down Expand Up @@ -341,7 +340,7 @@ restricts line-number to the specified list of major-mode.")
(defvar dotspacemacs-smart-closing-parenthesis nil
"If non-nil pressing the closing parenthesis `)' key in insert mode passes
over any automatically added closing parenthesis, bracket, quote, etc…
This can be temporary disabled by pressing `C-q' before `)'. (default nil)")
This can be temporary disabled by pressing `C-q' before `)'.")

(defvar dotspacemacs-zone-out-when-idle nil
"Either nil or a number of seconds. If non-nil zone out after the specified
Expand All @@ -350,7 +349,7 @@ number of seconds.")
(defvar dotspacemacs-highlight-delimiters 'all
"Select a scope to highlight delimiters. Possible values are `any',
`current', `all' or `nil'. Default is `all' (highlight any scope and
emphasis the current one.")
emphasize the current one.")

(defvar dotspacemacs-whitespace-cleanup nil
"delete whitespace while saving buffer. possible values are `all'
Expand Down
16 changes: 10 additions & 6 deletions core/templates/.spacemacs.template
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ It should only modify the values of Spacemacs settings."
;; (default t)
dotspacemacs-elpa-https t
;; Maximum allowed time in seconds to contact an ELPA repository.
;; (default 5)
dotspacemacs-elpa-timeout 5
;; If non-nil then spacemacs will check for updates at startup
;; when the current branch is not `develop'. Note that checking for
Expand All @@ -91,7 +92,7 @@ It should only modify the values of Spacemacs settings."
dotspacemacs-check-for-update nil
;; If non-nil, a form that evaluates to a package directory. For example, to
;; use different package directories for different Emacs versions, set this
;; to `emacs-version'.
;; to `emacs-version'. (default nil)
dotspacemacs-elpa-subdirectory nil
;; One of `vim', `emacs' or `hybrid'.
;; `hybrid' is like `vim' except that `insert state' is replaced by the
Expand All @@ -117,7 +118,7 @@ It should only modify the values of Spacemacs settings."
;; `spacemacs-buffer-startup-lists-length' takes effect.
dotspacemacs-startup-lists '((recents . 5)
(projects . 7))
;; True if the home buffer should respond to resize events.
;; True if the home buffer should respond to resize events. (default t)
dotspacemacs-startup-buffer-responsive t
;; Default major mode of the scratch buffer (default `text-mode')
dotspacemacs-scratch-mode 'text-mode
Expand All @@ -127,6 +128,7 @@ It should only modify the values of Spacemacs settings."
dotspacemacs-themes '(spacemacs-dark
spacemacs-light)
;; If non-nil the cursor color matches the state color in GUI Emacs.
;; (default t)
dotspacemacs-colorize-cursor-according-to-state t
;; Default font, or prioritized list of fonts. `powerline-scale' allows to
;; quickly tweak the mode-line size to make separators look not too crappy.
Expand All @@ -135,7 +137,7 @@ It should only modify the values of Spacemacs settings."
:weight normal
:width normal
:powerline-scale 1.1)
;; The leader key
;; The leader key (default "SPC")
dotspacemacs-leader-key "SPC"
;; The key used for Emacs commands `M-x' (after pressing on the leader key).
;; (default "SPC")
Expand Down Expand Up @@ -178,7 +180,7 @@ It should only modify the values of Spacemacs settings."
;; start. (default nil)
dotspacemacs-auto-resume-layouts nil
;; If non-nil, auto-generate layout name when creating new layouts. Only has
;; effect when using the "jump to layout by number" commands.
;; effect when using the "jump to layout by number" commands. (default nil)
dotspacemacs-auto-generate-layout-names nil
;; Size (in MB) above which spacemacs will prompt to open the large file
;; literally to avoid performance issues. Opening a file literally means that
Expand All @@ -204,8 +206,9 @@ It should only modify the values of Spacemacs settings."
;; source settings. Else, disable fuzzy matching in all sources.
;; (default 'always)
dotspacemacs-helm-use-fuzzy 'always
;; If non-nil, the paste transient-state is enabled. And pressing `p' several
;; times, cycles through the elements in the `kill-ring'. (default nil)
;; If non-nil, the paste transient-state is enabled. While enabled, pressing
;; `p' several times cycles through the elements in the `kill-ring'.
;; (default nil)
dotspacemacs-enable-paste-transient-state nil
;; Which-key delay in seconds. The which-key buffer is the popup listing
;; the commands bound to the current keystroke sequence. (default 0.4)
Expand Down Expand Up @@ -308,6 +311,7 @@ It should only modify the values of Spacemacs settings."
;; %n - Narrow if appropriate
;; %z - mnemonics of buffer, terminal, and keyboard coding systems
;; %Z - like %z, but including the end-of-line format
;; (default "%I@%S")
dotspacemacs-frame-title-format "%I@%S"
;; Format specification for setting the icon title format
;; (default nil - same as frame-title-format)
Expand Down

0 comments on commit 0fb17fa

Please sign in to comment.