diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 7 | ||||
| -rw-r--r-- | README.md | 5 | ||||
| -rwxr-xr-x | acprep | 2 | ||||
| -rw-r--r-- | default.nix | 7 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | doc/ledger.1 | 5 | ||||
| -rw-r--r-- | doc/ledger3.texi | 15 | ||||
| -rw-r--r-- | tools/excludes | 1 |
10 files changed, 16 insertions, 33 deletions
@@ -57,7 +57,6 @@ doc/latex/ doc/refman.pdf doc/report/ doc/version.texi -elisp-comp install-sh intl/ ledger diff --git a/CMakeLists.txt b/CMakeLists.txt index 969ded69..f5da6a04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,6 @@ option(BUILD_DEBUG "Build support for runtime debugging" OFF) option(BUILD_LIBRARY "Build and install Ledger as a library" ON) option(BUILD_DOCS "Build and install documentation" OFF) option(BUILD_WEB_DOCS "Build version of documentation suitable for viewing online" OFF) -option(BUILD_EMACSLISP "Build and install ledger-mode for Emacs" OFF) if (BUILD_DEBUG) set(CMAKE_BUILD_TYPE Debug) @@ -307,9 +306,6 @@ endif() add_subdirectory(src) add_subdirectory(doc) -if (BUILD_EMACSLISP) - add_subdirectory(lisp) -endif() add_subdirectory(test) ######################################################################## diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bab3f7c8..25dea39e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Tips for contributors * Please **make pull requests against `next`, not `master`**. Ledger follows a [git-flow] branching model, in which development happens on the `next` branch and is subsequently merged into `master` for releases. -* If you're making **changes to `ledger-mode`, or other files for which the Travis build is not +* If you're making **changes to files for which the Travis build is not relevant**, please **add `[ci skip]` to the end of the commit message**. GLOSSARY @@ -82,8 +82,6 @@ orientation: **./lib/**: a couple of libraries used in development. -**./lisp/**: the [Emacs][] [ledger-mode] lisp code, under the [GPLv2] license. - **./python/**: samples using the Python ledger module. **./src/**: the C++ header and source files in a flat directory. @@ -110,7 +108,4 @@ orientation: [small badge]: https://img.shields.io/travis/ledger/ledger/master.svg?&style=flat [git-flow]: http://nvie.com/posts/a-successful-git-branching-model/ [README.md]: https://github.com/ledger/ledger/blob/master/README.md -[Emacs]: http://www.gnu.org/software/emacs/ -[ledger-mode]: http://ledger-cli.org/3.0/doc/ledger-mode.html -[GPLv2]: http://www.gnu.org/licenses/gpl-2.0.html [clang]: http://clang.llvm.org @@ -35,8 +35,9 @@ Now try your first ledger command: For help on keeping your journal have a look at the [documentation] and the [wiki][] (Also see the “Resources” section at the -end of this file). An emacs mode for ledger files can be found in the `lisp` -directory and a vim plugin is located in the [ledger/vim-ledger repository]. +end of this file). An Emacs mode for Ledger files can be found in the +[ledger/ledger-mode repository] and a vim plugin is located in the +[ledger/vim-ledger repository]. ## To the Rest @@ -484,7 +484,7 @@ class PrepareBuild(CommandLineApp): def phase_sloc(self, *args): self.log.info('Executing phase: sloc') - self.execute('sloccount', 'src', 'python', 'lisp', 'test') + self.execute('sloccount', 'src', 'python', 'test') ######################################################################### # Update local files with the latest information # diff --git a/default.nix b/default.nix index 791f9ff7..2878e7c2 100644 --- a/default.nix +++ b/default.nix @@ -14,13 +14,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; - # Skip byte-compiling of emacs-lisp files because this is currently - # broken in ledger... - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp -v "$src/lisp/"*.el $out/share/emacs/site-lisp/ - ''; - meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index e463c721..d8242eeb 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -42,7 +42,7 @@ if (BUILD_DOCS) find_program(TEX tex) find_program(MAN2HTML man2html) find_program(GROFF groff) - set(ledger_info_files ledger3.texi ledger-mode.texi) + set(ledger_info_files ledger3.texi) if (NOT MAKEINFO) message(WARNING "Could not find makeinfo. Info version of documentation cannot be built.") diff --git a/doc/ledger.1 b/doc/ledger.1 index ffc7decf..80649496 100644 --- a/doc/ledger.1 +++ b/doc/ledger.1 @@ -111,9 +111,8 @@ The synonym is also accepted. .It Ic emacs Oo Ar query Oc Output posting and transaction data in a format readily consumed by the Emacs -editor, in a series of Lisp forms. This is used by the -.Pa ledger.el -Emacs mode to process reporting data from +editor, in a series of Lisp forms. This is used by the Emacs ledger-mode to +process reporting data from .Nm . .It Ic equity Oo Ar report-query Oc Print a transaction with a series of postings that balance current totals for diff --git a/doc/ledger3.texi b/doc/ledger3.texi index 3857f8d4..4427b8e7 100644 --- a/doc/ledger3.texi +++ b/doc/ledger3.texi @@ -1490,13 +1490,14 @@ nature of your transactions. For example, you do not need to tell Ledger about the accounts you use. Any time Ledger sees a posting involving an account it knows nothing about, it will create it@footnote{This also means if you -misspell an account it will end up getting counted separately from what -you intended. The provided Emacs major mode provides for automatically -filling in account names.}. If you use a commodity that is new to -Ledger, it will create that commodity, and determine its display -characteristics (placement of the symbol before or after the amount, -display precision, etc.) based on how you used the commodity in the -posting. +misspell an account it will end up getting counted separately from +what you intended. An Emacs major mode +@uref{https://github.com/ledger/ledger-mode/, ledger-mode} provides +tab completion for automatically filling in account names.}. If you +use a commodity that is new to Ledger, it will create that commodity, +and determine its display characteristics (placement of the symbol +before or after the amount, display precision, etc.) based on how you +used the commodity in the posting. @menu * The Most Basic Entry:: diff --git a/tools/excludes b/tools/excludes index 762a27c9..f758854e 100644 --- a/tools/excludes +++ b/tools/excludes @@ -24,7 +24,6 @@ data_tests depcomp doc/.dirstamp doc/ledger.info -elisp-comp expr_tests install-sh intl/ |