Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore emacs desktop files. #1044

Merged
merged 1 commit into from
Oct 24, 2016

Conversation

ben-denham
Copy link
Contributor

For users who enable desktop-save-mode, it is useful to have changes to the desktop files ignored by Git.

@bbatsov bbatsov merged commit 8f01458 into bbatsov:master Oct 24, 2016
suutari-ai added a commit to suutari-ai/prelude that referenced this pull request Oct 28, 2016
* 'master' of https://github.com/bbatsov/prelude:
  Update saveplace to work with Emacs 25 (bbatsov#1046)
  Ignore emacs desktop files (bbatsov#1044)
  [Fix bbatsov#1004] Correct the Salt link in the README
  [Fix bbatsov#1012] Update a reference to a crux function
  Update the README for Emacs 25
  Rename .emacs if it exists in the installer(bbatsov#1037)
  Add helm-occur-from-isearch to isearch-mode-map (bbatsov#1030)
  Wrap kill-region with defadvice from crux (bbatsov#1035)
  pretzo -> prezto (bbatsov#1034)
  Add kotlin-mode to the auto-install list (bbatsov#1016)
  Fix a broken link in README.md (bbatsov#1007)
  Add a gratipay badge
  Make the scala-mode dependency explicit
  Remove a mention of scala-mode2
  Update the donation options
  Replace `scala-mode2` with the `ensime` package (bbatsov#1001)
  Update README.md (bbatsov#996)
  Fix the crux-like changes (bbatsov#995)
  Change function name to crux (bbatsov#992)
  Auto-install cask-mode when needed
  Fix C-a behavior (bbatsov#991)
  Replace some of the bundled code with the crux package
  [bbatsov#956] Mention that Emacs 24.4 is required
  Improve code style a bit
  [Fix bbatsov#989] Use eldoc-mode instead of haskell-doc-mode
  Fix some auto-pairing issues when editing erb file with web-mode (bbatsov#805)
hbin pushed a commit to hbin/emacs.d that referenced this pull request Feb 22, 2017
hbin pushed a commit to hbin/emacs.d that referenced this pull request Feb 22, 2017
pappachino pushed a commit to pappachino/prelude that referenced this pull request Mar 16, 2017
dliappis pushed a commit to dliappis/prelude that referenced this pull request Jul 12, 2017
suutari added a commit to suutari/prelude that referenced this pull request Sep 2, 2017
* 'master' of github.com:bbatsov/prelude:
  Add the prelude-rust.el module (bbatsov#1102)
  Mentioned requirement of having no ~/.emacs file.
  Upgrade prelude-common-lisp.el (bbatsov#1099)
  [Fix bbatsov#1096] Remove ido-ubiquitous and add ido-completing-read+ (bbatsov#1100)
  Making the prelude-erc module more modular
  Refine missing bundled example file warning (bbatsov#1094)
  Fix message about location of prelude-modules.el after install
  Emacs latest release is 25.2
  Use elpa repository for 'queue' and 'spinner' packages
  Add stanza inserted by Package.el cf. bbatsov#1056
  [Fix bbatsov#743] Add support for package pinning (bbatsov#1048)
  Update the copyright years
  Code style
  Use http protocol instead of https for ELPA on Windows
  Disable Flycheck warnings for `personal`
  Use settings from .editorconfig file (bbatsov#1008)
  Don't alter C-a binding in orgmode
  Update saveplace to work with Emacs 25 (bbatsov#1046)
  Ignore emacs desktop files (bbatsov#1044)
  [Fix bbatsov#1004] Correct the Salt link in the README
  [Fix bbatsov#1012] Update a reference to a crux function
  Update the README for Emacs 25
  Rename .emacs if it exists in the installer(bbatsov#1037)
  Add helm-occur-from-isearch to isearch-mode-map (bbatsov#1030)
  Wrap kill-region with defadvice from crux (bbatsov#1035)
  pretzo -> prezto (bbatsov#1034)
  Add kotlin-mode to the auto-install list (bbatsov#1016)
  Fix a broken link in README.md (bbatsov#1007)
  Add a gratipay badge
  Make the scala-mode dependency explicit
  Remove a mention of scala-mode2
  Update the donation options
  Replace `scala-mode2` with the `ensime` package (bbatsov#1001)
  Update README.md (bbatsov#996)
  Fix the crux-like changes (bbatsov#995)
  Change function name to crux (bbatsov#992)
  Auto-install cask-mode when needed
  Fix C-a behavior (bbatsov#991)
  Replace some of the bundled code with the crux package
  [bbatsov#956] Mention that Emacs 24.4 is required
  Improve code style a bit
  [Fix bbatsov#989] Use eldoc-mode instead of haskell-doc-mode
  Fix some auto-pairing issues when editing erb file with web-mode (bbatsov#805)
elthariel pushed a commit to elthariel/prelude that referenced this pull request Sep 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants