aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | run-python: Make the buffer running python currentTino Calancha2018-05-151-4/+6
| | | | | | | | | | | | | | | | * lisp/progmodes/python.el (run-python, python-shell-make-comint): Make the buffer running the inferior python process the current buffer (Bug#31398). * test/lisp/progmodes/python-tests.el (python-tests--bug31398): Add test.
* | The tedious game of whack-a-mole with compiler warnings continuesGlenn Morris2018-04-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/abbrev.el (edit-abbrevs-map): * lisp/emacs-lock.el (emacs-lock-from-exiting): * lisp/htmlfontify.el (hfy-optimisations): * lisp/ielm.el (inferior-emacs-lisp-mode-hook) (inferior-emacs-lisp-mode-map): * lisp/isearch.el (isearch-lazy-highlight-word): * lisp/select.el (x-select-enable-clipboard, x-select-enable-primary): * lisp/shell.el (shell-dirtrack-mode): * lisp/skeleton.el (skeleton-transformation, skeleton-filter): * lisp/startup.el (inhibit-splash-screen, inhibit-startup-message): * lisp/window.el (even-window-heights): * lisp/calendar/timeclock.el (timeclock-modeline-display): * lisp/cedet/semantic/db-mode.el (semanticdb-mode-hook) (semanticdb-global-mode): * lisp/emacs-lisp/edebug.el (gud-inhibit-global-bindings): * lisp/emacs-lisp/warnings.el (display-warning-minimum-level) (log-warning-minimum-level): * lisp/erc/erc-dcc.el (erc-dcc-chat-filter-hook): * lisp/gnus/nnspool.el (news-path): * lisp/org/org-agenda.el (org-agenda-search-view-search-words-only) (org-agenda-remove-tags-when-in-prefix) (org-agenda-align-tags-to-column, org-agenda-keymap): * lisp/org/org.el (org-special-ctrl-a) (org-log-state-notes-into-drawer) (org-agenda-multi-occur-extra-files): * lisp/progmodes/flymake-proc.el (flymake-err-line-patterns) (flymake-check-file-limit): * lisp/progmodes/make-mode.el (makefile-query-one-target-method): * lisp/progmodes/octave.el (inferior-octave-startup-hook): * lisp/progmodes/python.el (python-buffer) (python-preoutput-result): * lisp/progmodes/sql.el (sql-dialect): * lisp/textmodes/artist.el (artist-text-renderer): * lisp/textmodes/bibtex.el (bibtex-autokey-name-case-convert) (bibtex-autokey-titleword-case-convert): * lisp/textmodes/flyspell.el (flyspell-generic-check-word-p): * lisp/textmodes/ispell.el (ispell-format-word): * lisp/textmodes/rst.el (rst-preferred-decorations): * lisp/textmodes/sgml-mode.el (sgml-transformation): Move aliases before targets, to silence new compiler warning. * lisp/term/ns-win.el (ns-option-modifier, ns-right-option-modifier): Silence warning.
* | Fix python-shell-send-defun at start of buffer (Bug#30822)nitishch2018-04-081-3/+6
| | | | | | | | | | | | | | * lisp/progmodes/python.el (python-shell-send-defun): Handle the case when we hit the beginning of buffer. Copyright-paperwork-exempt: yes
* | Fix issues turned up by previous python.el changeNoam Postavsky2018-03-011-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See [1] for more discussion. * lisp/progmodes/python.el (python--prettify-symbols-alist): Define the obsolete alias before the variable proper, so that we correctly get the user's settings regardless of which name they set. (python-nav-end-of-statement): Add missing backslash. (python-shell-send-file): Call `expand-file-name' before `file-local-name', the expansion of "~" could be different on remote filenames. (python-mode): Declare prettify-symbols-alist instead of checking if it's bound. Use the non-obsolete python-prettify-symbols-alist name, rather than checking if the obsolete name is bound (it always is too, but the Emacs 24 byte compiler doesn't recognize that define-obsolete-variable-alias defines a variable). [1]: https://lists.gnu.org/archive/html/emacs-devel/2018-02/msg00826.html
* | Fix python.el for Emacs 24, bump ELPA version to 0.26.1 (Bug#30633)Noam Postavsky2018-02-271-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | Since python.el is distributed via GNU ELPA, it should be functional in earlier Emacs versions. Also fix some compile warnings. * lisp/progmodes/python.el: Bump version to 0.26.1. Define `prog-first-column' and `file-local-name' also at compile time, as needed. (inferior-python-mode-hook): Declare for the benefit of Emacs 24.3. (python-nav-end-of-statement): Fix format string for assertion error. (python-shell-tramp-refresh-process-environment): Don't `function' quote a symbol which might not be fbound. (python-mode): Only use prettify-symbols settings if they're bound.
* | Merge from origin/emacs-26Glenn Morris2018-02-171-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes f21f8e6 Document 'desktop-files-not-to-save' d8917eb Improve documentation of Profiling features b228839 Improve indexing of "performance" in ELisp manual ab67b3e Minor change in Emacs manual's VC chapter c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3... 593bbda Document comment-fill-column in the manual (Bug#11636) bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits. 69107f3 ; Fix doc typos related to indefinite articles aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... 5906418 More fixes for the Emacs manual 9ab3df1 ; Fix doc typos related to indefinite articles 66a4e65 ; Fix doc typos related to indefinite articles 35e5c57 ; Fix doc typos related to indefinite articles
| * ; Fix doc typos related to indefinite articlesGlenn Morris2018-02-161-3/+3
| |
* | * lisp/progmodes/python.el: Bump package version to 0.26.Noam Postavsky2018-02-121-1/+1
| |
* | Fix an infloop in python-nav-beginning-of-statementDmitry Gutov2018-02-121-1/+2
|/ | | | | * lisp/progmodes/python.el (python-nav-beginning-of-statement): Fix an infloop (bug#30277).
* New customization variable for python-mode indentation (Bug#28475)Ross Donaldson2018-01-011-2/+8
| | | | | | | | * lisp/progmodes/python.el (python-indent-def-block-scale): New variable. (python-indent--calculate-indentation): Let it control how many indent levels are inserted for multi-line function signatures. Copyright-paperwork-exempt: yes
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
| | | | Run admin/update-copyright.
* Merge branch 'widen-less' into emacs-26Dmitry Gutov2017-12-211-24/+8
|\
| * Consolidate 'widen' callsDmitry Gutov2017-12-141-24/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/prog-mode.el (prog-indentation-context): Un-document all elements but the first. (prog-widen): Remove. (http://lists.gnu.org/archive/html/emacs-devel/2017-12/msg00321.html) * doc/lispref/text.texi (Mode-Specific Indent): Update. * lisp/progmodes/ruby-mode.el (ruby-calculate-indent): Don't call widen. * lisp/progmodes/python.el (python-indent-guess-indent-offset) (python-info-current-defun): Replace prog-widen with widen; these functions are not called during indentation. (python-indent-context) (python-indent--calculate-indentation) (python-info-dedenter-opening-block-message) (python-info-line-ends-backslash-p) (python-info-beginning-of-backslash) (python-info-continuation-line-p) (python-info-current-defun): Remove 'widen' calls. * lisp/indent.el (indent-according-to-mode) (indent-for-tab-command, indent-region): Move them here. * lisp/textmodes/mhtml-mode.el (mhtml-indent-line): Bind prog-indentation-context to one-element list.
* | Fix some more aliases to user optionsGlenn Morris2017-12-201-20/+20
| | | | | | | | | | | | | | | | | | | | * lisp/cus-edit.el (custom-mode-hook): * lisp/erc/erc.el (erc-default-coding-system): * lisp/progmodes/python.el (python-indent, python-guess-indent) (python-shell-virtualenv-path) (python-shell-completion-module-string-code) (python-shell-completion-pdb-string-code, python-use-skeletons): Define aliases to user options before the options are defined.
* | python.el doc fixesCharles A. Roelli2017-12-171-7/+6
| | | | | | | | | | | | | | * lisp/progmodes/python.el (python-shell-accept-process-output): (python-shell-comint-end-of-output-p): (python-shell-first-prompt-hook): (python-info-beginning-of-backslash): Doc fixes.
* | Add missing :version tags revealed by cusver-checkGlenn Morris2017-12-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/comint.el (comint-move-point-for-matching-input): * lisp/epa.el (epa-replace-original-text): * lisp/image-dired.el (image-dired-cmd-optipng-program) (image-dired-cmd-optipng-options): * lisp/emacs-lisp/bytecomp.el (byte-compile-cond-use-jump-table): * lisp/gnus/gnus-cloud.el (gnus-cloud-storage-method) (gnus-cloud-interactive): * lisp/net/mailcap.el (mailcap-user-mime-data): * lisp/progmodes/cc-vars.el (c-asymmetry-fontification-flag) (c-noise-macro-names, c-noise-macro-with-parens-names): * lisp/progmodes/flymake.el (flymake-start-on-flymake-mode) (flymake-wrap-around): * lisp/progmodes/grep.el (grep-use-null-filename-separator): * lisp/progmodes/js.el (js-indent-align-list-continuation): * lisp/progmodes/perl-mode.el (perl-flymake-command): * lisp/progmodes/python.el (python-flymake-command) (python-flymake-command-output-pattern, python-flymake-msg-alist): * lisp/progmodes/ruby-mode.el (ruby-flymake-use-rubocop-if-available) (ruby-rubocop-config): * lisp/textmodes/less-css-mode.el (less-css): * lisp/textmodes/tex-mode.el (tex-chktex-program) (tex-chktex-extra-flags): Add missing :version tags.
* | Use forward slashes for python w32 config example (Bug#21656)Noam Postavsky2017-12-031-2/+2
| | | | | | | | | | | | * lisp/progmodes/python.el: Use forward slashes for Windows path example, it doesn't require doubling of slashes which reduces chances of confusion.
* | Disable electric indent for python strings (Bug#29305)Noam Postavsky2017-12-021-1/+5
|/ | | | | * lisp/progmodes/python.el (python-indent-post-self-insert-function): Do nothing when point or beginning of line is in string.
* Support python virtualenv on w32 (Bug#24464)Justin Timmons2017-11-051-5/+10
| | | | | | | | | | | | According to the virtualenv docs only POSIX systems follow the structure "/path/to/venv/bin/", while windows systems use "/path/to/venv/Scripts" for the location of the binary files, most importantly including the python interpreter (see: https://virtualenv.pypa.io/en/stable/userguide/#windows-notes). * lisp/progmodes/python.el (python-shell-calculate-exec-path): Use the "/path/to/venv/Scripts" for `windows-nt' machines. Copyright-paperwork-exempt: yes
* Add a Flymake backend for Python (bug#28808)Lele Gaifax2017-11-051-1/+135
| | | | | | | | | | | | | | | Implement new Flymake backend with related customizable settings. * lisp/progmodes/python.el (python-flymake-command) (python-flymake-command-output-pattern) (python-flymake-msg-alist): New defcustom. (python--flymake-parse-output): New function, able to parse python-flymake-command output accordingly to python-flymake-command-output-pattern. (python-flymake): New function implementing the backend interface using python--flymake-parse-output for the real work. (python-mode): Add python-flymake to flymake-diagnostic-functions.
* Disable python native completion on w32 (Bug#28580)Noam Postavsky2017-10-151-2/+3
| | | | | | * lisp/progmodes/python.el (python-shell-completion-native-disabled-interpreters): For windows-nt systems, put an empty string to match interpreters.
* Make python prettify symbols into a defvar (Bug#28713)Noam Postavsky2017-10-071-2/+6
| | | | | | | * lisp/progmodes/python.el (python-prettify-symbols-alist): New variable. (python--prettify-symbols-alist): Make into obsolete alias for `python-prettify-symbols-alist'.
* Give more helpful messages for python completion setup failuresNoam Postavsky2017-10-021-1/+5
| | | | | | | * lisp/progmodes/python.el (python-shell-completion-native-setup): In case the completion setup failed with some exception, print out the exception type and message. If libedit is detected, raise an exception, since this is known to fail.
* Improve python3-compatibility of fallback completion (Bug#28499)Joerg Behrmann2017-09-251-3/+3
| | | | | | | | * lisp/progmodes/python.el (python-eldoc-setup-code): Use inspect.getfullargspec instead of inspect.getargspec to avoid a deprecation warning on every usage of eldoc in python-mode. Copyright-paperwork-exempt: yes
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-3/+3
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* Disable completion while entering python multiline statementsNoam Postavsky2017-08-271-1/+15
| | | | | | | | | | | The "legacy" completion mechanism sends newlines to the running python process to get the list of completions, which confuses things if the user is in the middle of entering a multiline statement (Bug#28051). It's better to disable completion in this case. * lisp/progmodes/python.el (python-shell--block-prompt): New variable. (python-shell-prompt-set-calculated-regexps): Set it. (python-shell-completion-at-point): Return 'ignore' as the completion function when the current prompt is a block prompt.
* Work around w32-python-2.x bug to fix prompt detection (Bug#21376)Noam Postavsky2017-08-201-1/+5
| | | | | | * lisp/progmodes/python.el (python-shell-prompt-detect): Don't put carriage returns into the temporary file when running in unbuffered mode, the w32 build of python 2.7 chokes on them.
* * lisp/progmodes/python.el (auto-mode-alist): Add .pyi. (Bug#27847)Glenn Morris2017-07-051-1/+1
|
* Add watch for password back to inferior python comint filterGlenn Morris2017-06-021-1/+2
| | | | | | | | It was removed along with other items for speed (bug#16875), but doesn't seem to have been causing an issue, and it's useful to have it there (bug#27154). * lisp/progmodes/python.el (inferior-python-mode): Add comint-watch-for-password-prompt to comint-output-filter-functions.
* Comply with pep 8 style guide for backslash in assignment (Bug#24809)Jules Tamagnan2017-05-281-1/+1
| | | | | | | | * lisp/progmodes/python.el (python-indent--calculate-indentation): Increase indent by `python-indent-offset' after `:after-backslash-assignment-continuation'. Copyright-paperwork-exempt: yes
* Protect against an infloop in python-modePhilipp Stephani2017-03-231-3/+13
| | | | | | | | | | | | | | | | | There appears to be an edge case caused by using `syntax-ppss' in a narrowed buffer during JIT lock inside of Python triple-quote strings. Unfortunately it is impossible to reproduce without manually destroying the syntactic information in the Python buffer, but it has been observed in practice. In that case it can happen that the syntax caches get sufficiently out of whack so that there appear to be overlapping strings in the buffer. As Python has no nested strings, this situation is impossible and leads to an infloop in `python-nav-end-of-statement'. Protect against this by checking whether the search for the end of the current string makes progress. * python.el (python-nav-end-of-statement): Protect against infloop. * progmodes/python-tests.el (python-tests--python-nav-end-of-statement--infloop): Add unit test.
* Merge from origin/emacs-25Paul Eggert2017-03-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a094732 * etc/PROBLEMS: Say that HP-UX cc doesn't work. 1925dd9 Fix duplicate wording in Emacs manual 6de8429 * lisp/paren.el (show-paren--default, show-paren-function): A... 2d671fd Fix wording in Emacs manual a8766a2 Document how to customize input methods 6eb8995 * lisp/net/eww.el (eww-reload): Doc fix. (Bug#25981) aceac95 Fix warning message about native completion (Bug#25984) a314c1f Clarify documentation of 'raise' and 'height' display specs f366f6e Mention problems with GPaste in PROBLEMS 6e788ef ; etc/PROBLEMS: Explain about the python+libedit problem (Bug... 6406618 Fix doc strings in info.el c1ed152 ; * src/keyboard.c (Fposn_at_point): Fix last change. eed9677 Fix doc string of 'posn-at-point' 0d5957e Documentation fix in elisp reference manual
| * Fix warning message about native completion (Bug#25984)Noam Postavsky2017-03-051-1/+1
| | | | | | | | | | * lisp/progmodes/python.el (python-shell-completion-native-turn-on-maybe): The relevant variable is `python-shell-completion-native-enable'.
* | Merge from origin/emacs-25Paul Eggert2017-03-191-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec4226d * lisp/woman.el (woman): Fix docstring prefix arg description. 2b774fa Mention "editor" in Emacs man page header ae60d0c Document problems with nerd-fonts 2fdb5a9 ; Details about pinning Emacs to w32 task bar 5c3105e * doc/lispref/modes.texi (Derived Modes): Make example more i... 4c51ef4 Clarify what is the "cursor" 8303c32 ; * etc/NEWS: Copyedits. 3f7493e ; Fix a typo in comment c54cf8d Improve commentary in lisp.h 8b92f86 ; * admin/make-tarball.txt: Cross-reference admin/release-pro... 0ba9932 Disable native completion for ipython (Bug#25067) 38fc456 Fix a typo in ada-mode manual 00e75ba ; * src/coding.c (Fencode_coding_region): Fix a typo in the d... a541c21 Clarify documentation of 'bufferpos-to-filepos' and 'filepos-... # Conflicts: # etc/NEWS # etc/PROBLEMS
| * Disable native completion for ipython (Bug#25067)Noam Postavsky2017-02-071-2/+4
| | | | | | | | | | * lisp/progmodes/python.el: (python-shell-completion-native-disabled-interpreters): Add "ipython".
* | Merge from origin/emacs-25Paul Eggert2017-03-191-2/+1
|\ \ | |/ | | | | | | | | | | | | | | 0e35405 Improve documentation of coding-systems c2fd04c Improve definition of 'variable-pitch' face on MS-Windows 16fb50d Fix an error message in python.el a2a2073 Clarify major mode switching fc38671 Add helpful comment to compile-command's docstring ee65d85 Fix ':version' of 'select-enable-primary'
| * Fix an error message in python.elEli Zaretskii2017-01-091-2/+1
| | | | | | | | | | * lisp/progmodes/python.el (python-shell-get-process-or-error): Don't repeat the same key binding twice. (Bug#25405)
* | python-mode: Fix detection for opening blocks.Hong Xu2017-01-261-2/+18
| | | | | | | | | | | | | | | | | | * python.el (python-info-dedenter-opening-block-positions): There can't be any back-indented lines between an opening block and the current line. * python-tests.el (python-indent-electric-colon-4): Add an indent test case where there is one-more indented previous opening block.
* | Fix extracting async def type and name in python mode imenuDmitry Lazurkin2017-01-121-5/+12
| | | | | | | | | | | | | | | | | | | | * lisp/progmodes/python.el (python-imenu--get-defun-type-name): New function. (python-imenu--build-tree): Use python-imenu--get-defun-type-name for extract async or simple def type and name at current position (Bug#24820). * test/lisp/progmodes/python-tests.el (python-imenu-create-index-1): (python-imenu-create-flat-index-1): Add async def's.
* | Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\ \ | |/ | | | | | | 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| | | | | | | | Run admin/update-copyright.
* | Fix bad quoting of python-shell-interpreterNoam Postavsky2016-12-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | `python-shell-calculate-command' was using `shell-quote-argument' as if it was generating a shell command, but its callers don't pass the result to a shell, and they expect to parse it with `split-string-and-unquote'. This caused problems depending on the flavor of shell quoting in effect (Bug#25025). * lisp/progmodes/python.el (python-shell-calculate-command): Use `combine-and-quote-strings' to quote the interpreter, so that it can be parsed by `python-shell-make-comint' successfully using `split-string-and-unquote'.
* | Add file-local-nameMichael Albinus2016-11-201-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * doc/lispref/files.texi (Magic File Names): Add `file-local-name'. (Unique File Names): Use it. * etc/NEWS: Mention `file-local-name'. * lisp/files.el (file-local-name): New defun. (file-expand-wildcards): * lisp/eshell/em-tramp.el (eshell/su, eshell/sudo): * lisp/eshell/esh-ext.el (eshell-remote-command): * lisp/eshell/esh-proc.el (eshell-gather-process-output): * lisp/org/ob-core.el (org-babel-local-file-name): * lisp/progmodes/gud.el (gud-common-init, gud-format-command): * lisp/progmodes/python.el (python-shell-send-file): * lisp/shell.el (shell): * lisp/vc/ediff-diff.el (ediff-same-file-contents): * lisp/vc/vc-git.el (vc-git-checkin): Use it.
* | Merge from origin/emacs-25Paul Eggert2016-11-191-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4af5981 Add a comment in generated refcards about the source ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment. 4887e7c js-mode: Fix indent problem after a regexp e992ac0 Fix sluggish display of symbols in UTF-8 language environment 1fc101b Don't confuse how Texinfo outputs @var with the input 91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame... f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da... 5b0cddd More fixes in copyright notices in etc/refcards/ f994c20 Update copyright text in refcards 9ad2ae7 Fix Outline command names 26c3554 Send text received by bracketed paste to process db0b58d Correct the statement about programming modes always running ... 78aece4 Improve documentation of 'occur' eb364fd Do call debugger on failed cl-assert 3ef4ee8 Avoid infloop in python 8da810f Don't refer to obsolete FEATURE-unload-hook 4f478ca Improve documentation of dabbrevs 7272e5d * lisp/chistory.el (list-command-history): Doc fix. (Bug#24890) 89b7482 * lisp/simple.el (set-mark-command): Doc fix. (Bug#24890) 3b199f7 Improve documentation of some Help commands 93d3a0e Fix documentation of yes-or-no prompts af04919 Fix documentation of partial completion style ed80184 Fix documentation of the mode line on emacsclient frames e6be855 Fix description of 'C-z' in User manual 16f7007 Improve and clarify documentation of Outline Mode 31d93aa Add Emacs version number to nt/README.W32 0b6b815 Fix python-mode hideshow regexp dc152c5 Modernize usage of 'macOS' in doc and comments 84c5343 Prefer comments /* like this */ in C code bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845). 3ef86fd Clarify documentation of face attribute functions de51d59 ; * nt/README.W32: Minor copyedits. db436e9 Don't call debug on failed cl-assert # Conflicts: # doc/emacs/cmdargs.texi # etc/NEWS # etc/PROBLEMS # lisp/auth-source.el # lisp/net/tramp-sh.el
| * Avoid infloop in pythonDaniel Colascione2016-11-081-2/+9
| | | | | | | | | | | | | | | | | | | | Fix bug#24905 * lisp/progmodes/python.el (python-info-docstring-p): Improve infloop avoidance: replace (bobp) with generic test for forward progress. * test/lisp/progmodes/python-tests.el (python-bob-infloop-avoid): Add test for bug#24905
| * Fix python-mode hideshow regexpNoam Postavsky2016-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 2015-02-07 "Fix hideshow integration[...]" changed the regexp added to `hs-special-modes-alist' so that it worked when not searching from the beginning of the line. However, this allows matching tokens ending in "def" or "class", not just those keywords. This results in an infinite loop in hs-hide-all (Bug #24815). * lisp/progmodes/python.el (python-mode): Add symbol boundaries around the def|class matching part of the regexp added to hs-special-modes-alist.
| * Modernize usage of 'macOS' in doc and commentsPaul Eggert2016-11-061-1/+1
| | | | | | | | | | | | | | | | Apple changed the spelling of its operating system again, to "macOS", effective with macOS 10.12 Sierra (2016-09-20). Change Emacs documentation and comments to match this. Stick with older OS spellings ("OS X", "Mac OS X") when talking about older releases where the older names are more correct.
* | Fix arglist in python.el (Bug#24762)Mark Oteiza2016-11-171-4/+4
| | | | | | | | | | * lisp/progmodes/python.el: Remove unneeded second args. (python-define-auxiliary-skeleton): DOC arg should be &optional.
* | Avoid infloop in pythonDaniel Colascione2016-11-081-2/+9
| | | | | | | | | | | | | | | | | | | | Fix bug#24905 * lisp/progmodes/python.el (python-info-docstring-p): Improve infloop avoidance: replace (bobp) with generic test for forward progress. * test/lisp/progmodes/python-tests.el (python-bob-infloop-avoid): Add test for bug#24905
* | Merge from origin/emacs-25Paul Eggert2016-11-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | dbb3410 python.el: Fix detection of native completion in Python 3 (bu... 91c97b6 * Makefile.in (install-arch-indep): Skip etc/refcards/emacsve... 9c1cb8d * lisp/subr.el (set-transient-map): Exit for unbound events (... 9c247d2 Update category-table for Chinese characters 43986d1 Inhibit buffer relocation during regex searches fee4cef Revert fixes to allocation of regex matching